X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=ce38bd8ae78900d986874f990f03c98c4010e39c;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=c4b8b3e2f52fd2dc9a0820c676c37acae3037dab;hpb=26fdcc5e41254131ef755b14243c19d202b14d8e;p=yaz-moved-to-github.git

diff --git a/server/eventl.c b/server/eventl.c
index c4b8b3e..ce38bd8 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -1,97 +1,11 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: eventl.c,v $
- * Revision 1.27  1999-02-02 13:57:34  adam
- * Uses preprocessor define WIN32 instead of WINDOWS to build code
- * for Microsoft WIN32.
- *
- * Revision 1.26  1998/02/11 11:53:35  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.25  1998/01/29 13:30:23  adam
- * Better event handle system for NT/Unix.
- *
- * Revision 1.24  1997/09/04 14:19:13  adam
- * Added credits.
- *
- * Revision 1.23  1997/09/01 08:52:59  adam
- * New windows NT/95 port using MSV5.0. The test server 'ztest' was
- * moved a separate directory. MSV5.0 project server.dsp created.
- * As an option, the server can now operate as an NT service.
- *
- * 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.34 2002-11-26 16:56:21 adam Exp $
  */
 
-#include <yconfig.h>
 #include <stdio.h>
 #include <assert.h>
 #ifdef WIN32
@@ -103,12 +17,22 @@
 #include <errno.h>
 #include <string.h>
 
-#include <log.h>
-#include <comstack.h>
-#include <xmalloc.h>
+#include <yaz/yconfig.h>
+#include <yaz/log.h>
+#include <yaz/comstack.h>
+#include <yaz/xmalloc.h>
 #include "eventl.h"
 #include "session.h"
-#include <statserv.h>
+#include <yaz/statserv.h>
+
+#if YAZ_GNU_THREADS
+#include <pth.h>
+#define YAZ_EV_SELECT pth_select
+#endif
+
+#ifndef YAZ_EV_SELECT
+#define YAZ_EV_SELECT select
+#endif
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
@@ -136,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);
@@ -156,10 +85,18 @@ int event_loop(IOCHAN *iochans)
 	    if (p->fd > max)
 	        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;
+	    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 */
@@ -169,7 +106,7 @@ int event_loop(IOCHAN *iochans)
                 cs_close(conn);
 	        destroy_association(assoc);
 	        iochan_destroy(*iochans);
-                logf(LOG_DEBUG, "error while selecting, destroying iochan %p",
+                yaz_log(LOG_DEBUG, "error select, destroying iochan %p",
 			*iochans);
             }
 	}