X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=901d7082c2b4dd4f463da9f1916d9012ec96fcbe;hb=c830124fd18d0bc1dc330d7d8b62aac51d12659c;hp=8eb29589a1a4c612cadc52543ddb9f67b509c630;hpb=d09e17f371431d3397588e6b749219608d37766a;p=yaz-moved-to-github.git

diff --git a/server/eventl.c b/server/eventl.c
index 8eb2958..901d708 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.13  1995-08-29 11:17:56  quinn
+ * 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
@@ -46,6 +64,7 @@
  *
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -59,7 +78,7 @@
 
 #include <eventl.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 static IOCHAN iochans = 0;
 
@@ -72,7 +91,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
     IOCHAN new;
 
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
     	return 0;
     new->destroyed = 0;
     new->fd = fd;
@@ -87,7 +106,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 
 int event_loop()
 {
-    do
+    do /* loop as long as there are active associations to process */
     {
     	IOCHAN p, nextp;
 	fd_set in, out, except;
@@ -99,7 +118,7 @@ int event_loop()
 	FD_ZERO(&out);
 	FD_ZERO(&except);
 	timeout = &to; /* hang on select */
-	to.tv_sec = 10/*5*60*/;
+	to.tv_sec = 5*60;
 	to.tv_usec = 0;
 	max = 0;
     	for (p = iochans; p; p = p->next)
@@ -144,8 +163,8 @@ int event_loop()
 		p->last_event = now;
 	    	(*p->fun)(p, EVENT_EXCEPT);
 	    }
-	    if (!p->destroyed && p->max_idle && now - p->last_event >
-	    	p->max_idle)
+	    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);
@@ -171,7 +190,7 @@ int event_loop()
 		}
 		if (nextp == p)
 		    nextp = p->next;
-		free(tmp);
+		xfree(tmp);
 	    }
 	}
     }