X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Feventl.c;h=3eff731d771f0beb3263d685875e7fb9f41fc6cc;hb=944037cb95ef7a0eed6502fdea7541f2431b55cc;hp=3a74751a28db7e6dfe0be461392a3cf8e0844816;hpb=80efa0b009565fd772664f177dcd56af81e186a1;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index 3a74751..3eff731 100644
--- 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->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);
     }
 }
 
@@ -137,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;
@@ -147,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)
@@ -158,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)
@@ -170,19 +180,17 @@ 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)
         {
             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,75 +207,68 @@ 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 || 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;
@@ -275,11 +276,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);
 }