projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce Z39.50/SRU operation timeout.
[pazpar2-moved-to-github.git]
/
src
/
eventl.h
diff --git
a/src/eventl.h
b/src/eventl.h
index
595d858
..
b31fca2
100644
(file)
--- a/
src/eventl.h
+++ b/
src/eventl.h
@@
-1,7
+1,5
@@
-/* $Id: eventl.h,v 1.4 2007-04-10 08:48:56 adam Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2009 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-14,10
+12,10
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
#ifndef EVENTL_H
#define EVENTL_H
#ifndef EVENTL_H
#define EVENTL_H
@@
-27,6
+25,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
struct iochan;
typedef void (*IOC_CALLBACK)(struct iochan *i, int event);
struct iochan;
typedef void (*IOC_CALLBACK)(struct iochan *i, int event);
+typedef int (*IOC_SOCKETFUN)(struct iochan *i);
+typedef int (*IOC_MASKFUN)(struct iochan *i);
typedef struct iochan
{
typedef struct iochan
{
@@
-36,9
+36,10
@@
typedef struct iochan
#define EVENT_OUTPUT 0x02
#define EVENT_EXCEPT 0x04
#define EVENT_TIMEOUT 0x08
#define EVENT_OUTPUT 0x02
#define EVENT_EXCEPT 0x04
#define EVENT_TIMEOUT 0x08
-#define EVENT_WORK 0x10
int force_event;
IOC_CALLBACK fun;
int force_event;
IOC_CALLBACK fun;
+ IOC_SOCKETFUN socketfun;
+ IOC_MASKFUN maskfun;
void *data;
int destroyed;
time_t last_event;
void *data;
int destroyed;
time_t last_event;
@@
-63,6
+64,10
@@
typedef struct iochan
#define iochan_getnext(i) ((i)->next)
#define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0))
#define iochan_activity(i) ((i)->last_event = time(0))
#define iochan_getnext(i) ((i)->next)
#define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0))
#define iochan_activity(i) ((i)->last_event = time(0))
+#define iochan_setsocketfun(i, f) ((i)->socketfun = (f))
+#define iochan_getsocketfun(i) ((i)->socketfun)
+#define iochan_setmaskfun(i, f) ((i)->maskfun = (f))
+#define iochan_getmaskfun(i) ((i)->maskfun)
IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags);
int event_loop(IOCHAN *iochans);
IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags);
int event_loop(IOCHAN *iochans);