/*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: eventl.c,v $
- * Revision 1.22 1996-07-06 19:58:35 quinn
- * System headerfiles gathered in yconfig
- *
- * Revision 1.21 1996/02/21 12:55:51 quinn
- * small
- *
- * Revision 1.20 1996/02/21 12:52:55 quinn
- * Test
- *
- * Revision 1.19 1995/12/05 11:17:30 quinn
- * Moved some paranthesises around. Sigh.
- *
- * Revision 1.18 1995/11/13 09:27:41 quinn
- * Fiddling with the variant stuff.
- *
- * Revision 1.17 1995/11/07 12:37:44 quinn
- * Added support for forcing TIMEOUT event.
- *
- * Revision 1.16 1995/11/01 13:54:56 quinn
- * Minor adjustments
- *
- * Revision 1.15 1995/09/15 14:44:15 quinn
- * *** empty log message ***
- *
- * Revision 1.14 1995/08/29 14:44:50 quinn
- * Reset timeouts.
- *
- * Revision 1.13 1995/08/29 11:17:56 quinn
- * Added code to receive close
- *
- * Revision 1.12 1995/08/29 10:41:18 quinn
- * Small.
- *
- * Revision 1.11 1995/06/19 12:39:09 quinn
- * Fixed bug in timeout code. Added BER dumper.
- *
- * Revision 1.10 1995/06/16 10:31:33 quinn
- * Added session timeout.
- *
- * Revision 1.9 1995/06/05 10:53:31 quinn
- * Added a better SCAN.
- *
- * Revision 1.8 1995/05/16 08:51:01 quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.7 1995/03/27 15:02:01 quinn
- * Added some includes for better portability
- *
- * Revision 1.6 1995/03/27 08:34:21 quinn
- * Added dynamic server functionality.
- * Released bindings to session.c (is now redundant)
- *
- * Revision 1.5 1995/03/15 08:37:41 quinn
- * Now we're pretty much set for nonblocking I/O.
- *
- * Revision 1.4 1995/03/14 16:59:48 quinn
- * Bug-fixes
- *
- * Revision 1.3 1995/03/14 11:30:14 quinn
- * Works better now.
- *
- * Revision 1.2 1995/03/14 10:27:59 quinn
- * More work on demo server.
- *
- * Revision 1.1 1995/03/10 18:22:44 quinn
- * The rudiments of an asynchronous server.
- *
+ * $Id: eventl.c,v 1.35 2003-02-12 15:06:43 adam Exp $
*/
-#include <yconfig.h>
#include <stdio.h>
#include <assert.h>
+#ifdef WIN32
+#include <winsock.h>
+#else
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <errno.h>
#include <string.h>
-#include <eventl.h>
+#include <yaz/yconfig.h>
+#include <yaz/log.h>
+#include <yaz/comstack.h>
+#include <yaz/xmalloc.h>
+#include "eventl.h"
+#include "session.h"
+#include <yaz/statserv.h>
-#include <xmalloc.h>
+#if YAZ_GNU_THREADS
+#include <pth.h>
+#define YAZ_EV_SELECT pth_select
+#endif
-static IOCHAN iochans = 0;
-
-IOCHAN iochan_getchan(void)
-{
- return iochans;
-}
+#ifndef YAZ_EV_SELECT
+#define YAZ_EV_SELECT select
+#endif
IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
{
- IOCHAN new;
+ IOCHAN new_iochan;
- if (!(new = xmalloc(sizeof(*new))))
+ if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan))))
return 0;
- new->destroyed = 0;
- new->fd = fd;
- new->flags = flags;
- new->fun = cb;
- new->next = iochans;
- new->force_event = 0;
- new->last_event = new->max_idle = 0;
- iochans = new;
- return new;
+ new_iochan->destroyed = 0;
+ new_iochan->fd = fd;
+ new_iochan->flags = flags;
+ new_iochan->fun = cb;
+ new_iochan->force_event = 0;
+ new_iochan->last_event = new_iochan->max_idle = 0;
+ new_iochan->next = NULL;
+ return new_iochan;
}
-int event_loop()
+int event_loop(IOCHAN *iochans)
{
do /* loop as long as there are active associations to process */
{
static struct timeval nullto = {0, 0}, to;
struct timeval *timeout;
+ 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 = 5*60;
to.tv_usec = 0;
max = 0;
- for (p = iochans; p; p = p->next)
+ for (p = *iochans; p; p = p->next)
{
+ yaz_log(LOG_LOG, "fd=%d flags=%d force_event=%d",
+ p->fd, p->flags, p->force_event);
if (p->force_event)
- timeout = &nullto; /* polling select */
+ timeout = &nullto; /* polling select */
if (p->flags & EVENT_INPUT)
- FD_SET(p->fd, &in);
+ FD_SET(p->fd, &in);
if (p->flags & EVENT_OUTPUT)
- FD_SET(p->fd, &out);
+ FD_SET(p->fd, &out);
if (p->flags & EVENT_EXCEPT)
- FD_SET(p->fd, &except);
+ FD_SET(p->fd, &except);
if (p->fd > max)
- max = p->fd;
+ max = p->fd;
}
- if ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
+ yaz_log(LOG_LOG, "select start");
+ res = YAZ_EV_SELECT(max + 1, &in, &out, &except, timeout);
+ yaz_log(LOG_LOG, "select end");
+ if (res < 0)
{
- if (errno == EINTR)
- continue;
- return 1;
+ if (yaz_errno() == EINTR)
+ {
+ if (statserv_must_terminate())
+ {
+ for (p = *iochans; p; p = p->next)
+ p->force_event = EVENT_TIMEOUT;
+ }
+ continue;
+ }
+ else
+ {
+ /* Destroy the first member in the chain, and try again */
+ association *assoc = (association *)iochan_getdata(*iochans);
+ COMSTACK conn = assoc->client_link;
+
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(*iochans);
+ yaz_log(LOG_DEBUG, "error select, destroying iochan %p",
+ *iochans);
+ }
}
- for (p = iochans; p; p = p->next)
+ for (p = *iochans; p; p = p->next)
{
int force_event = p->force_event;
time_t now = time(0);
p->force_event = 0;
- if (!p->destroyed && (FD_ISSET(p->fd, &in) || force_event ==
- EVENT_INPUT))
+ if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
+ force_event == EVENT_INPUT))
{
- p->last_event = now;
- (*p->fun)(p, EVENT_INPUT);
+ p->last_event = now;
+ (*p->fun)(p, EVENT_INPUT);
}
if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
- force_event == EVENT_OUTPUT))
+ force_event == EVENT_OUTPUT))
{
- p->last_event = now;
+ p->last_event = now;
(*p->fun)(p, EVENT_OUTPUT);
}
if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
- force_event == EVENT_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->max_idle) || force_event == EVENT_TIMEOUT))
{
- p->last_event = now;
- (*p->fun)(p, EVENT_TIMEOUT);
+ p->last_event = now;
+ (*p->fun)(p, EVENT_TIMEOUT);
}
}
- for (p = iochans; p; p = nextp)
+ for (p = *iochans; p; p = nextp)
{
nextp = p->next;
if (p->destroyed)
{
- IOCHAN tmp = p, pr;
+ IOCHAN tmp = p, pr;
+
+ /* We need to inform the threadlist that this channel has been destroyed */
+ statserv_remove(p);
- if (p == iochans)
- iochans = p->next;
+ /* Now reset the pointers */
+ if (p == *iochans)
+ *iochans = p->next;
else
{
- for (pr = iochans; pr; pr = pr->next)
- if (pr->next == p)
- break;
+ 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;
}
}
}
}
- while (iochans);
+ while (*iochans);
return 0;
}
projects / yaz-moved-to-github.git / blobdiff