X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=ce38bd8ae78900d986874f990f03c98c4010e39c;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=0ba7f4a27e5cfb56b3b2853053f10a39c7f166ee;hpb=d054cdd41417401fbba915e20203882159f32283;p=yaz-moved-to-github.git diff --git a/server/eventl.c b/server/eventl.c index 0ba7f4a..ce38bd8 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -3,7 +3,7 @@ * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Id: eventl.c,v 1.32 2002-09-25 12:37:07 adam Exp $ + * $Id: eventl.c,v 1.34 2002-11-26 16:56:21 adam Exp $ */ #include @@ -60,6 +60,11 @@ int event_loop(IOCHAN *iochans) 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); @@ -84,7 +89,14 @@ int event_loop(IOCHAN *iochans) if (res < 0) { if (yaz_errno() == EINTR) - continue; + { + 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 */