X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=3eff731d771f0beb3263d685875e7fb9f41fc6cc;hb=5fd1cc0768a02607d750dd8d53149abfb94d483d;hp=a2abda5523dd8306a85d075c17c79537d50da014;hpb=69d77699072d43a5292ac4b8af55e7d401e21f80;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index a2abda5..3eff731 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -127,7 +127,7 @@ static void work_handler(void *work_data)
 
 static void run_fun(iochan_man_t man, IOCHAN p)
 {
-    if (!p->destroyed && p->this_event)
+    if (p->this_event)
     {
         if (man->sel_thread)
         {
@@ -155,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)
@@ -166,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)
@@ -178,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)
         {
@@ -222,37 +222,35 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
             int force_event = p->force_event;
             time_t now = time(0);
             
-            if (p->thread_users > 0)
+            if (p->thread_users > 0 || p->destroyed)
             {
                 yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
                 continue;
             }
             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))
+
+            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 (!p->destroyed && (FD_ISSET(p->fd, &in) ||
-                                      force_event == EVENT_INPUT))
+                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 (!p->destroyed && (FD_ISSET(p->fd, &out) ||
-                                      force_event == EVENT_OUTPUT))
+                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 (!p->destroyed && (FD_ISSET(p->fd, &except) ||
-                                      force_event == EVENT_EXCEPT))
+                if (FD_ISSET(p->fd, &except) || force_event == EVENT_EXCEPT)
                 {
                     p->last_event = now;
                     p->this_event |= EVENT_EXCEPT;
@@ -267,9 +265,9 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
 	    {
                 *nextp = p->next;
                 xfree(p);
-                break;
 	    }
-            nextp = &p->next;
+            else
+                nextp = &p->next;
         }
     }
     while (*iochans);