Hit pazpar2 directly (no apache)

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

diff --git a/src/eventl.c b/src/eventl.c
index 0f7ef31..3eff731 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -115,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->this_event)
     {
-        p->this_event = event;
         if (man->sel_thread)
         {
             yaz_log(man->log_level, "eventl: add fun chan=%p event=%d",
-                    p, event);
+                    p, p->this_event);
             p->thread_users++;
             sel_thread_add(man->sel_thread, p);
         }
         else
-            (*p->fun)(p, p->this_event);
+            work_handler(p);
     }
 }
 
@@ -139,7 +145,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
 {
     do /* loop as long as there are active associations to process */
     {
-       IOCHAN p, nextp;
+       IOCHAN p, *nextp;
        fd_set in, out, except;
        int res, max;
        static struct timeval nullto = {0, 0}, to;
@@ -149,7 +155,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
        FD_ZERO(&out);
        FD_ZERO(&except);
        timeout = &to; /* hang on select */
-       to.tv_sec = 15;
+       to.tv_sec = 300;
        to.tv_usec = 0;
        max = 0;
        for (p = *iochans; p; p = p->next)
@@ -160,6 +166,8 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
                 p->flags = (*p->maskfun)(p);
             if (p->socketfun)
                 p->fd = (*p->socketfun)(p);
+            if (p->max_idle && p->max_idle < to.tv_sec)
+                to.tv_sec = p->max_idle;
             if (p->fd < 0)
                 continue;
            if (p->force_event)
@@ -172,8 +180,6 @@ static int event_loop(iochan_man_t man, 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 (man->sel_fd != -1)
         {
@@ -211,65 +217,58 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
                 }
             }
         }
-       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 || p->destroyed)
+            {
+                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);
-           }
-       }
-       for (p = *iochans; p; p = nextp)
-       {
-           nextp = p->next;
+            }
+            p->this_event = 0;
+            p->force_event = 0;
 
-           if (p->destroyed)
+            if ((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 (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 (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 (FD_ISSET(p->fd, &except) || force_event == EVENT_EXCEPT)
+                {
+                    p->last_event = now;
+                    p->this_event |= EVENT_EXCEPT;
+                }
+            }
+            run_fun(man, p);
+       }
+        for (nextp = iochans; *nextp; )
+        {
+            IOCHAN p = *nextp;
+           if (p->destroyed && p->thread_users == 0)
            {
-               IOCHAN tmp = p, pr;
-
-               /* Now reset the pointers */
-                if (p == *iochans)
-                   *iochans = p->next;
-               else
-               {
-                   for (pr = *iochans; pr; pr = pr->next)
-                       if (pr->next == p)
-                           break;
-                   assert(pr); /* grave error if it weren't there */
-                   pr->next = p->next;
-               }
-               if (nextp == p)
-                   nextp = p->next;
-               xfree(tmp);
+                *nextp = p->next;
+                xfree(p);
            }
-       }
+            else
+                nextp = &p->next;
+        }
     }
     while (*iochans);
     return 0;