X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=ce38bd8ae78900d986874f990f03c98c4010e39c;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=2d9886b252b8799f2af6290be0593fa224c36144;hpb=afff2d64ae8758642c8e88bfebff9c00a982daa4;p=yaz-moved-to-github.git diff --git a/server/eventl.c b/server/eventl.c index 2d9886b..ce38bd8 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -1,135 +1,174 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995-2001, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: eventl.c,v $ - * 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.34 2002-11-26 16:56:21 adam Exp $ */ +#include #include -#include -#include +#ifdef WIN32 +#include +#else #include +#endif #include +#include +#include -#include +#include +#include +#include +#include +#include "eventl.h" +#include "session.h" +#include -#include +#if YAZ_GNU_THREADS +#include +#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 = malloc(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; - 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 + 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 nullto = {0, 0}; + 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); - timeout = 0; /* hang on select */ + timeout = &to; /* hang on select */ + 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) { if (p->force_event) - timeout = &nullto; + 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) + res = YAZ_EV_SELECT(max + 1, &in, &out, &except, timeout); + 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 (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT) - (*p->fun)(p, EVENT_INPUT); + 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)) + 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)) + 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) + 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; - assert(pr); + 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; - free(tmp); + xfree(tmp); } } } - while (iochans); + while (*iochans); return 0; }