events: fix event type being propagated

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

diff --git a/src/eventl.c b/src/eventl.c
index 3a74751..a263c64 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -59,16 +59,18 @@ struct iochan_man_s {
     IOCHAN channel_list;
     sel_thread_t sel_thread;
     int sel_fd;
-    int use_threads;
+    int no_threads;
+    int log_level;
 };
 
-iochan_man_t iochan_man_create(int use_threads)
+iochan_man_t iochan_man_create(int no_threads)
 {
     iochan_man_t man = xmalloc(sizeof(*man));
     man->channel_list = 0;
     man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
     man->sel_fd = -1;
-    man->use_threads = use_threads;
+    man->no_threads = no_threads;
+    man->log_level = YLOG_DEBUG;
     return man;
 }
 
@@ -113,23 +115,29 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 static void work_handler(void *work_data)
 {
     IOCHAN p = work_data;
-    (*p->fun)(p, p->this_event);
+    if (!p->destroyed && (p->this_event & EVENT_TIMEOUT))
+        (*p->fun)(p, EVENT_TIMEOUT);
+    if (!p->destroyed && (p->this_event & EVENT_INPUT))
+        (*p->fun)(p, EVENT_INPUT);
+    if (!p->destroyed && (p->this_event & EVENT_OUTPUT))
+        (*p->fun)(p, EVENT_OUTPUT);
+    if (!p->destroyed && (p->this_event & EVENT_EXCEPT))
+        (*p->fun)(p, EVENT_EXCEPT);
 }
 
-static void run_fun(iochan_man_t man, IOCHAN p, int event)
+static void run_fun(iochan_man_t man, IOCHAN p)
 {
-    if (!p->destroyed)
+    if (!p->destroyed && p->this_event)
     {
-        p->this_event = event;
         if (man->sel_thread)
         {
-            yaz_log(YLOG_LOG, "eventl: add fun chan=%p event=%d",
-                    p, event);
+            yaz_log(man->log_level, "eventl: add fun chan=%p event=%d",
+                    p, p->this_event);
             p->thread_users++;
             sel_thread_add(man->sel_thread, p);
         }
         else
-            (*p->fun)(p, p->this_event);
+            work_handler(p);
     }
 }
 
@@ -177,12 +185,12 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
         {
             if (man->sel_fd > max)
                 max = man->sel_fd;
-            yaz_log(YLOG_LOG, "select on sel fd=%d", man->sel_fd);
+            yaz_log(man->log_level, "select on sel fd=%d", man->sel_fd);
             FD_SET(man->sel_fd, &in);
         }
-        yaz_log(YLOG_LOG, "select begin");
+        yaz_log(man->log_level, "select begin");
         res = select(max + 1, &in, &out, &except, timeout);
-        yaz_log(YLOG_LOG, "select returned res=%d", res);
+        yaz_log(man->log_level, "select returned res=%d", res);
         if (res < 0)
        {
            if (errno == EINTR)
@@ -199,56 +207,64 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
             {
                 IOCHAN chan;
 
-                yaz_log(YLOG_LOG, "eventl: sel input on sel_fd=%d",
+                yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
                         man->sel_fd);
                 while ((chan = sel_thread_result(man->sel_thread)))
                 {
-                    yaz_log(YLOG_LOG, "eventl: got thread result p=%p",
+                    yaz_log(man->log_level, "eventl: got thread result p=%p",
                             chan);
                     chan->thread_users--;
                 }
             }
         }
-       for (p = *iochans; p; p = p->next)
-       {
-           int force_event = p->force_event;
-           time_t now = time(0);
-
-           p->force_event = 0;
-           if (!p->destroyed && ((p->max_idle && now - p->last_event >
-               p->max_idle) || force_event == EVENT_TIMEOUT))
-           {
-               p->last_event = now;
-               run_fun(man, p, EVENT_TIMEOUT);
-           }
-            if (p->fd < 0)
+        for (p = *iochans; p; p = p->next)
+        {
+            int force_event = p->force_event;
+            time_t now = time(0);
+            
+            if (p->thread_users > 0)
+            {
+                yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
                 continue;
-           if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
-               force_event == EVENT_INPUT))
-           {
-               p->last_event = now;
-                yaz_log(YLOG_DEBUG, "Eventl input event");
-               run_fun(man, 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");
-               run_fun(man, p, EVENT_OUTPUT);
-           }
-           if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
-               force_event == EVENT_EXCEPT))
-           {
-               p->last_event = now;
-               run_fun(man, p, EVENT_EXCEPT);
-           }
+            }
+            p->this_event = 0;
+            p->force_event = 0;
+            if (!p->destroyed && ((p->max_idle && now - p->last_event >
+                                   p->max_idle) || force_event == EVENT_TIMEOUT))
+            {
+                p->last_event = now;
+                p->this_event |= EVENT_TIMEOUT;
+            }
+            if (p->fd >= 0)
+            {
+                if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
+                                      force_event == EVENT_INPUT))
+                {
+                    p->last_event = now;
+                    yaz_log(YLOG_DEBUG, "Eventl input event");
+                    p->this_event |= 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->this_event |= EVENT_OUTPUT;
+                }
+                if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
+                                      force_event == EVENT_EXCEPT))
+                {
+                    p->last_event = now;
+                    p->this_event |= EVENT_EXCEPT;
+                }
+            }
+            run_fun(man, p);
        }
        for (p = *iochans; p; p = nextp)
        {
            nextp = p->next;
 
-           if (p->destroyed)
+           if (p->destroyed && p->thread_users == 0)
            {
                IOCHAN tmp = p, pr;
 
@@ -275,11 +291,12 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
 
 void iochan_man_events(iochan_man_t man)
 {
-    if (man->use_threads && !man->sel_thread)
+    if (man->no_threads > 0 && !man->sel_thread)
     {
         man->sel_thread = sel_thread_create(
-            work_handler, 0 /*work_destroy */, &man->sel_fd, 10);
-        yaz_log(YLOG_LOG, "iochan_man_events. sel_thread started");
+            work_handler, 0 /*work_destroy */, &man->sel_fd, man->no_threads);
+        yaz_log(man->log_level, "iochan_man_events. Using %d threads",
+                man->no_threads);
     }
     event_loop(man, &man->channel_list);
 }