X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Feventl.c;h=7946839fc88d6c521f6e9c88a68e59c0023c75d4;hb=42d3d8a6486c495357574e5db0fc736834d8ba40;hp=2d9886b252b8799f2af6290be0593fa224c36144;hpb=afff2d64ae8758642c8e88bfebff9c00a982daa4;p=yaz-moved-to-github.git

diff --git a/server/eventl.c b/server/eventl.c
index 2d9886b..7946839 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.6  1995-03-27 08:34:21  quinn
+ * 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)
  *
@@ -30,6 +42,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#ifdef _AIX
+#include <sys/select.h>
+#endif
 
 #include <eventl.h>
 
@@ -54,6 +71,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new->fun = cb;
     new->next = iochans;
     new->force_event = 0;
+    new->last_event = new->max_idle = 0;
     iochans = new;
     return new;
 }
@@ -65,13 +83,13 @@ int event_loop()
     	IOCHAN p, nextp;
 	fd_set in, out, except;
 	int res, max;
-	static struct timeval nullto = {0, 0};
+	static struct timeval nullto = {0, 0}, to = {60*5, 0};
 	struct timeval *timeout;
 
 	FD_ZERO(&in);
 	FD_ZERO(&out);
 	FD_ZERO(&except);
-	timeout = 0; /* hang on select */
+	timeout = &to; /* hang on select */
 	max = 0;
     	for (p = iochans; p; p = p->next)
     	{
@@ -95,16 +113,29 @@ int event_loop()
     	for (p = iochans; p; p = p->next)
     	{
 	    int force_event = p->force_event;
+	    time_t now = time(0);
 
 	    p->force_event = 0;
 	    if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
+	    {
+		p->last_event = now;
 	    	(*p->fun)(p, EVENT_INPUT);
+	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
-	   	 force_event == EVENT_OUTPUT))
+		force_event == EVENT_OUTPUT))
+	    {
+		p->last_event = now;
 	    	(*p->fun)(p, EVENT_OUTPUT);
+	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
 	    	force_event == EVENT_EXCEPT))
+	    {
+		p->last_event = now;
 	    	(*p->fun)(p, EVENT_EXCEPT);
+	    }
+	    if (!p->destroyed && p->max_idle && now - p->last_event >
+	    	p->max_idle)
+	    	(*p->fun)(p, EVENT_TIMEOUT);
 	}
 	for (p = iochans; p; p = nextp)
 	{
@@ -121,7 +152,7 @@ int event_loop()
 		    for (pr = iochans; pr; pr = pr->next)
 		    	if (pr->next == p)
 			    break;
-		    assert(pr);
+		    assert(pr); /* grave error if it weren't there */
 		    pr->next = p->next;
 		}
 		if (nextp == p)