X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Feventl.c;h=38807ee0282f9fe168a619be2c420be6a7baba90;hb=1f2abe92475f41651bc121b9d47e57dbd3d6e90a;hp=29a621c175431f8e554a10796bf1ccac4cd76f9b;hpb=cc178327044177f177d0474b757f53bcd86b4d42;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index 29a621c..38807ee 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * Based on revision YAZ' server/eventl.c 1.29.
  */
 
-#include <stdio.h>
-#include <assert.h>
-
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdio.h>
+#include <assert.h>
+
 #ifdef WIN32
 #include <winsock.h>
 #else
@@ -65,6 +65,8 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new_iochan->fd = fd;
     new_iochan->flags = flags;
     new_iochan->fun = cb;
+    new_iochan->socketfun = NULL;
+    new_iochan->maskfun = NULL;
     new_iochan->force_event = 0;
     new_iochan->last_event = new_iochan->max_idle = 0;
     new_iochan->next = NULL;
@@ -90,6 +92,10 @@ int event_loop(IOCHAN *iochans)
 	max = 0;
     	for (p = *iochans; p; p = p->next)
     	{
+            if (p->maskfun)
+                p->flags = (*p->maskfun)(p);
+            if (p->socketfun)
+                p->fd = (*p->socketfun)(p);
             if (p->fd < 0)
                 continue;
 	    if (p->force_event)
@@ -105,12 +111,16 @@ int event_loop(IOCHAN *iochans)
             if (p->max_idle && p->max_idle < to.tv_sec)
                 to.tv_sec = p->max_idle;
 	}
-	if ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
+        res = select(max + 1, &in, &out, &except, timeout);        
+        if (res < 0)
 	{
 	    if (errno == EINTR)
     		continue;
             else
-	 	abort();
+            {
+                yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+                return 0;
+            }
 	}
     	for (p = *iochans; p; p = p->next)
     	{
@@ -130,12 +140,14 @@ int event_loop(IOCHAN *iochans)
 		force_event == EVENT_INPUT))
 	    {
     		p->last_event = now;
+                yaz_log(YLOG_DEBUG, "Eventl input event");
 		(*p->fun)(p, EVENT_INPUT);
 	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
 	        force_event == EVENT_OUTPUT))
 	    {
 	  	p->last_event = now;
+                yaz_log(YLOG_DEBUG, "Eventl output event");
 	    	(*p->fun)(p, EVENT_OUTPUT);
 	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &except) ||