Added support for forcing TIMEOUT event.

[yaz-moved-to-github.git] / server / eventl.c

diff --git a/server/eventl.c b/server/eventl.c
index b057fc9..b1c8bb8 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.14  1995-08-29 14:44:50  quinn
+ * 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 +58,7 @@
  *
  */
 
+#include <stdio.h>
 #include <assert.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -62,7 +72,7 @@
 
 #include <eventl.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 static IOCHAN iochans = 0;
 
@@ -75,7 +85,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;
@@ -147,8 +157,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 +184,7 @@ int event_loop()
                }
                if (nextp == p)
                    nextp = p->next;
-               free(tmp);
+               xfree(tmp);
            }
        }
     }