X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Feventl.c;h=b9b88b5f2068dbcdd44c896d0f285e2f861c7742;hp=e363111a4da8dd83afd145cc066c1f06d9503040;hb=c3a132ce4aea3bb358b185ef58781b4bef8745fc;hpb=7e158942eb374e7211dd3dbd834e664c70a2d143

diff --git a/server/eventl.c b/server/eventl.c
index e363111..b9b88b5 100644
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
- * Revision 1.1  1995-03-10 18:22:44  quinn
+ * 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.
  *
  */
@@ -14,10 +33,19 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <string.h>
 
 #include <eventl.h>
 
-IOCHAN iochans = 0;
+#include <dmalloc.h>
+
+static IOCHAN iochans = 0;
+
+IOCHAN iochan_getchan(void)
+{
+    return iochans;
+}
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
@@ -29,14 +57,12 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new->fd = fd;
     new->flags = flags;
     new->fun = cb;
+    new->next = iochans;
+    new->force_event = 0;
+    iochans = new;
     return new;
 }
 
-void iochan_destroy(IOCHAN i)
-{
-    i->destroyed = 1;
-}
-
 int event_loop()
 {
     do
@@ -44,12 +70,18 @@ int event_loop()
     	IOCHAN p, nextp;
 	fd_set in, out, except;
 	int res, max;
+	static struct timeval nullto = {0, 0};
+	struct timeval *timeout;
 
 	FD_ZERO(&in);
 	FD_ZERO(&out);
 	FD_ZERO(&except);
+	timeout = 0; /* hang on select */
+	max = 0;
     	for (p = iochans; p; p = p->next)
     	{
+	    if (p->force_event)
+	    	timeout = &nullto;
 	    if (p->flags & EVENT_INPUT)
 	    	FD_SET(p->fd, &in);
 	    if (p->flags & EVENT_OUTPUT)
@@ -59,23 +91,30 @@ int event_loop()
 	    if (p->fd > max)
 	    	max = p->fd;
 	}
-	if ((res = select(max + 1, &in, &out, &except, 0)) < 0)
+	if ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
 	{
 	    if (errno == EINTR)
 		continue;
 	    return 1;
 	}
-	if (!res)
-	    continue;
-    	for (p = iochans; p; p = nextp)
+    	for (p = iochans; p; p = p->next)
     	{
-	    nextp = p->next;
-	    if (FD_ISSET(p->fd, &in))
+	    int force_event = p->force_event;
+
+	    p->force_event = 0;
+	    if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
 	    	(*p->fun)(p, EVENT_INPUT);
-	    if (!p->destroyed && FD_ISSET(p->fd, &in))
+	    if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
+	   	 force_event == EVENT_OUTPUT))
 	    	(*p->fun)(p, EVENT_OUTPUT);
-	    if (!p->destroyed && FD_ISSET(p->fd, &except))
+	    if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
+	    	force_event == EVENT_EXCEPT))
 	    	(*p->fun)(p, EVENT_EXCEPT);
+	}
+	for (p = iochans; p; p = nextp)
+	{
+	    nextp = p->next;
+
 	    if (p->destroyed)
 	    {
 	    	IOCHAN tmp = p, pr;