X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Feventl.c;h=b3dc6b8e60cc5f3bab8d428cc90fb3c33ec4c9ba;hp=b057fc9df3dd266de2071ddf077eefb37c1b71ff;hb=d29152205ca296a1aaea14ab2a656d53c68680f6;hpb=6d73e5de2a3311b596132f879f60d9d43230778e

diff --git a/server/eventl.c b/server/eventl.c
index b057fc9..b3dc6b8 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.14  1995-08-29 14:44:50  quinn
+ * 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
@@ -49,6 +70,7 @@
  *
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -62,7 +84,7 @@
 
 #include <eventl.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 static IOCHAN iochans = 0;
 
@@ -75,7 +97,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;
@@ -90,7 +112,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;
@@ -130,7 +152,8 @@ int event_loop()
 	    time_t now = time(0);
 
 	    p->force_event = 0;
-	    if (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);
@@ -147,8 +170,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);
@@ -174,7 +197,7 @@ int event_loop()
 		}
 		if (nextp == p)
 		    nextp = p->next;
-		free(tmp);
+		xfree(tmp);
 	    }
 	}
     }