Calling iochan_man_destroy

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

diff --git a/src/eventl.c b/src/eventl.c
index 29a621c..1251dfe 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 2006-2010 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
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /*
  * Based on  ParaZ - a simple tool for harvesting performance data for
  * parallel operations using Z39.50.
- * Copyright (c) 2000-2004 Index Data ApS
+ * Copyright (C) 2006-2010 Index Data ApS
  * See LICENSE file for details.
  */
 
@@ -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
@@ -53,7 +53,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/comstack.h>
 #include <yaz/xmalloc.h>
 #include "eventl.h"
-#include <yaz/statserv.h>
+
+struct iochan_man_s {
+    IOCHAN channel_list;
+};
+
+iochan_man_t iochan_man_create(void)
+{
+    iochan_man_t man = xmalloc(sizeof(*man));
+    man->channel_list = 0;
+    return man;
+}
+
+void iochan_man_destroy(iochan_man_t *mp)
+{
+    if (*mp)
+    {
+        xfree(*mp);
+        *mp = 0;
+    }
+}
+
+void iochan_add(iochan_man_t man, IOCHAN chan)
+{
+    chan->next = man->channel_list;
+    man->channel_list = chan;
+}
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
@@ -65,13 +90,15 @@ 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;
     return new_iochan;
 }
 
-int event_loop(IOCHAN *iochans)
+static int event_loop(IOCHAN *iochans)
 {
     do /* loop as long as there are active associations to process */
     {
@@ -90,6 +117,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 +136,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 +165,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) ||
@@ -174,10 +211,17 @@ int event_loop(IOCHAN *iochans)
     return 0;
 }
 
+void iochan_man_events(iochan_man_t man)
+{
+    event_loop(&man->channel_list);
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+