/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: eventl.c,v 1.8 2005-03-01 20:37:01 adam Exp $
+ * $Id: eventl.c,v 1.11 2007-01-03 08:42:15 adam Exp $
*/
/**
}
if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan))))
- return 0;
+ return 0;
new_iochan->destroyed = 0;
new_iochan->fd = fd;
new_iochan->flags = flags;
return new_iochan;
}
+int iochan_is_alive(IOCHAN chan)
+{
+ static struct timeval to;
+ fd_set in, out, except;
+ int res, max;
+
+ to.tv_sec = 0;
+ to.tv_usec = 0;
+
+ FD_ZERO(&in);
+ FD_ZERO(&out);
+ FD_ZERO(&except);
+
+ FD_SET(chan->fd, &in);
+
+ max = chan->fd + 1;
+
+ res = YAZ_EV_SELECT(max + 1, &in, 0, 0, &to);
+ if (res == 0)
+ return 1;
+ if (!ir_read(chan, EVENT_INPUT))
+ return 0;
+ return 1;
+}
+
int event_loop(IOCHAN *iochans)
{
do /* loop as long as there are active associations to process */
{
- IOCHAN p, nextp;
- fd_set in, out, except;
- int res, max;
- static struct timeval to;
+ IOCHAN p, nextp;
+ fd_set in, out, except;
+ int res, max;
+ static struct timeval to;
time_t now = time(0);
if (statserv_must_terminate())
for (p = *iochans; p; p = p->next)
p->force_event = EVENT_TIMEOUT;
}
- FD_ZERO(&in);
- FD_ZERO(&out);
- FD_ZERO(&except);
- to.tv_sec = 3600;
- to.tv_usec = 0;
- max = 0;
- for (p = *iochans; p; p = p->next)
- {
+ FD_ZERO(&in);
+ FD_ZERO(&out);
+ FD_ZERO(&except);
+ to.tv_sec = 3600;
+ to.tv_usec = 0;
+ max = 0;
+ for (p = *iochans; p; p = p->next)
+ {
time_t w, ftime;
yaz_log(log_level, "fd=%d flags=%d force_event=%d",
p->fd, p->flags, p->force_event);
- if (p->force_event)
+ if (p->force_event)
to.tv_sec = 0; /* polling select */
- if (p->flags & EVENT_INPUT)
- FD_SET(p->fd, &in);
- if (p->flags & EVENT_OUTPUT)
- FD_SET(p->fd, &out);
- if (p->flags & EVENT_EXCEPT)
- FD_SET(p->fd, &except);
- if (p->fd > max)
- max = p->fd;
+ if (p->flags & EVENT_INPUT)
+ FD_SET(p->fd, &in);
+ if (p->flags & EVENT_OUTPUT)
+ FD_SET(p->fd, &out);
+ if (p->flags & EVENT_EXCEPT)
+ FD_SET(p->fd, &except);
+ if (p->fd > max)
+ max = p->fd;
if (p->max_idle && p->last_event)
{
ftime = p->last_event + p->max_idle;
if (w < to.tv_sec)
to.tv_sec = w;
}
- }
+ }
yaz_log(log_level, "select start %ld", (long) to.tv_sec);
- res = YAZ_EV_SELECT(max + 1, &in, &out, &except, &to);
+ res = YAZ_EV_SELECT(max + 1, &in, &out, &except, &to);
yaz_log(log_level, "select end");
- if (res < 0)
- {
- if (yaz_errno() == EINTR)
+ if (res < 0)
+ {
+ if (yaz_errno() == EINTR)
{
if (statserv_must_terminate())
{
COMSTACK conn = assoc->client_link;
cs_close(conn);
- destroy_association(assoc);
- iochan_destroy(*iochans);
+ destroy_association(assoc);
+ iochan_destroy(*iochans);
yaz_log(log_level, "error select, destroying iochan %p",
- *iochans);
+ *iochans);
}
- }
+ }
now = time(0);
- for (p = *iochans; p; p = p->next)
- {
- int force_event = p->force_event;
-
- p->force_event = 0;
- if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
- force_event == EVENT_INPUT))
- {
- p->last_event = now;
- (*p->fun)(p, EVENT_INPUT);
- }
- if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
- force_event == EVENT_OUTPUT))
- {
- p->last_event = now;
- (*p->fun)(p, EVENT_OUTPUT);
- }
- if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
- force_event == EVENT_EXCEPT))
- {
- p->last_event = now;
- (*p->fun)(p, EVENT_EXCEPT);
- }
- if (!p->destroyed && ((p->max_idle && now - p->last_event >=
- p->max_idle) || force_event == EVENT_TIMEOUT))
- {
- p->last_event = now;
- (*p->fun)(p, EVENT_TIMEOUT);
- }
- }
- for (p = *iochans; p; p = nextp)
- {
- nextp = p->next;
-
- if (p->destroyed)
- {
- IOCHAN tmp = p, pr;
+ for (p = *iochans; p; p = p->next)
+ {
+ int force_event = p->force_event;
+
+ p->force_event = 0;
+ if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
+ force_event == EVENT_INPUT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_INPUT);
+ }
+ if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
+ force_event == EVENT_OUTPUT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_OUTPUT);
+ }
+ if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
+ force_event == EVENT_EXCEPT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_EXCEPT);
+ }
+ if (!p->destroyed && ((p->max_idle && now - p->last_event >=
+ p->max_idle) || force_event == EVENT_TIMEOUT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_TIMEOUT);
+ }
+ }
+ for (p = *iochans; p; p = nextp)
+ {
+ nextp = p->next;
+
+ if (p->destroyed)
+ {
+ IOCHAN tmp = p, pr;
/* We need to inform the threadlist that this channel has been destroyed */
statserv_remove(p);
- /* Now reset the pointers */
+ /* Now reset the pointers */
if (p == *iochans)
- *iochans = p->next;
- else
- {
- for (pr = *iochans; pr; pr = pr->next)
- if (pr->next == p)
- break;
- assert(pr); /* grave error if it weren't there */
- pr->next = p->next;
- }
- if (nextp == p)
- nextp = p->next;
- xfree(tmp);
- }
- }
+ *iochans = p->next;
+ else
+ {
+ for (pr = *iochans; pr; pr = pr->next)
+ if (pr->next == p)
+ break;
+ assert(pr); /* grave error if it weren't there */
+ pr->next = p->next;
+ }
+ if (nextp == p)
+ nextp = p->next;
+ xfree(tmp);
+ }
+ }
}
while (*iochans);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+