Added ZOOM support, only raw ingest missing at this point

[pazpar2-moved-to-github.git] / src / eventl.c

diff --git a/src/eventl.c b/src/eventl.c
index 2dfac4d..ad1df4b 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -28,19 +28,22 @@ 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 <cconfig.h>
+#include <config.h>
 #endif
 
+#include <stdio.h>
+#include <assert.h>
+
 #ifdef WIN32
 #include <winsock.h>
 #else
 #include <unistd.h>
 #endif
+#if HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
@@ -62,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;
@@ -87,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)
@@ -107,7 +116,10 @@ int event_loop(IOCHAN *iochans)
            if (errno == EINTR)
                continue;
             else
-               abort();
+            {
+                yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+                return 0;
+            }
        }
        for (p = *iochans; p; p = p->next)
        {
@@ -127,12 +139,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) ||