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 c9ecbd4..ad1df4b 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,27 +1,49 @@
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
+
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 /*
- * ParaZ - a simple tool for harvesting performance data for parallel
- * operations using Z39.50.
+ * Based on  ParaZ - a simple tool for harvesting performance data for
+ * parallel operations using Z39.50.
  * Copyright (c) 2000-2004 Index Data ApS
  * See LICENSE file for details.
  */
 
 /*
- * $Id: eventl.c,v 1.4 2007-04-08 23:04:20 adam Exp $
  * 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>
@@ -43,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;
@@ -63,11 +87,15 @@ int event_loop(IOCHAN *iochans)
        FD_ZERO(&out);
        FD_ZERO(&except);
        timeout = &to; /* hang on select */
-       to.tv_sec = 30;
+       to.tv_sec = 15;
        to.tv_usec = 0;
        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)
@@ -80,13 +108,18 @@ int event_loop(IOCHAN *iochans)
                FD_SET(p->fd, &except);
            if (p->fd > max)
                max = p->fd;
+            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)
        {
            if (errno == EINTR)
                continue;
             else
-               abort();
+            {
+                yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+                return 0;
+            }
        }
        for (p = *iochans; p; p = p->next)
        {
@@ -106,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) ||