X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Feventl.c;h=48c1abdbb7cf54e94ac0ea2e5825d3e9fddec1bc;hb=e94bb57662a692dd4c0502dfb4569bfa8b811d03;hp=a263c6435996b74ab6270a35ec9a0e113cb5f4ee;hpb=2ee54f76ebb2510e313a0ad34d09a23d0d9c23ae;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index a263c64..48c1abd 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -70,7 +70,8 @@ iochan_man_t iochan_man_create(int no_threads)
     man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
     man->sel_fd = -1;
     man->no_threads = no_threads;
-    man->log_level = YLOG_DEBUG;
+    man->log_level = yaz_log_module_level("iochan");
+
     return man;
 }
 
@@ -78,8 +79,18 @@ void iochan_man_destroy(iochan_man_t *mp)
 {
     if (*mp)
     {
+        IOCHAN c;
         if ((*mp)->sel_thread)
             sel_thread_destroy((*mp)->sel_thread);
+        
+        c = (*mp)->channel_list;
+        while (c)
+        {
+            IOCHAN c_next = c->next;
+            xfree(c->name);
+            xfree(c);
+            c = c_next;
+        }
         xfree(*mp);
         *mp = 0;
     }
@@ -92,7 +103,8 @@ void iochan_add(iochan_man_t man, IOCHAN chan)
     man->channel_list = chan;
 }
 
-IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags,
+                     const char *name)
 {
     IOCHAN new_iochan;
 
@@ -109,12 +121,17 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new_iochan->next = NULL;
     new_iochan->man = 0;
     new_iochan->thread_users = 0;
+    new_iochan->name = name ? xstrdup(name) : 0;
     return new_iochan;
 }
 
 static void work_handler(void *work_data)
 {
     IOCHAN p = work_data;
+
+    yaz_log(p->man->log_level, "eventl: work begin chan=%p name=%s event=%d",
+            p, p->name ? p->name : "", p->this_event);
+    
     if (!p->destroyed && (p->this_event & EVENT_TIMEOUT))
         (*p->fun)(p, EVENT_TIMEOUT);
     if (!p->destroyed && (p->this_event & EVENT_INPUT))
@@ -123,16 +140,19 @@ static void work_handler(void *work_data)
         (*p->fun)(p, EVENT_OUTPUT);
     if (!p->destroyed && (p->this_event & EVENT_EXCEPT))
         (*p->fun)(p, EVENT_EXCEPT);
+
+    yaz_log(p->man->log_level, "eventl: work end chan=%p name=%s event=%d",
+            p, p->name ? p->name : "", p->this_event);
 }
 
 static void run_fun(iochan_man_t man, IOCHAN p)
 {
-    if (!p->destroyed && p->this_event)
+    if (p->this_event)
     {
         if (man->sel_thread)
         {
-            yaz_log(man->log_level, "eventl: add fun chan=%p event=%d",
-                    p, p->this_event);
+            yaz_log(man->log_level, "eventl: work add chan=%p name=%s event=%d",
+                    p, p->name ? p->name : "", p->this_event);
             p->thread_users++;
             sel_thread_add(man->sel_thread, p);
         }
@@ -145,7 +165,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;
@@ -155,7 +175,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 +186,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,17 +200,14 @@ 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(man->log_level, "select on sel fd=%d", man->sel_fd);
             FD_SET(man->sel_fd, &in);
         }
-        yaz_log(man->log_level, "select begin");
+        yaz_log(man->log_level, "select begin nofds=%d", max);
         res = select(max + 1, &in, &out, &except, timeout);
         yaz_log(man->log_level, "select returned res=%d", res);
         if (res < 0)
@@ -211,48 +230,56 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
                         man->sel_fd);
                 while ((chan = sel_thread_result(man->sel_thread)))
                 {
-                    yaz_log(man->log_level, "eventl: got thread result p=%p",
-                            chan);
+                    yaz_log(man->log_level, "eventl: got thread result chan=%p name=%s",
+                            chan, chan->name ? chan->name : "");
                     chan->thread_users--;
                 }
             }
         }
+        if (man->log_level)
+        {
+            int no = 0;
+            for (p = *iochans; p; p = p->next)
+                no++;
+            yaz_log(man->log_level, "%d channels", no);
+        }
         for (p = *iochans; p; p = p->next)
         {
             int force_event = p->force_event;
             time_t now = time(0);
             
+            if (p->destroyed)
+            {
+                yaz_log(man->log_level, "eventl: skip destroyed chan=%p name=%s", p, p->name ? p->name : "");
+                continue;
+            }
             if (p->thread_users > 0)
             {
-                yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
+                yaz_log(man->log_level, "eventl: skip chan=%p name=%s users=%d", p, p->name ? p->name : "", 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;
@@ -260,30 +287,18 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
             }
             run_fun(man, p);
 	}
-	for (p = *iochans; p; p = nextp)
-	{
-	    nextp = p->next;
-
+        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->name);
+                xfree(p);
 	    }
-	}
+            else
+                nextp = &p->next;
+        }
     }
     while (*iochans);
     return 0;