Merge branch 'adam_thread_work' of ssh://git.indexdata.com/home/git/pub/pazpar2 into...

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

diff --git a/src/eventl.c b/src/eventl.c
index a343e93..21548b0 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -70,7 +70,7 @@ 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 = YLOG_LOG;
     return man;
 }
 
@@ -78,8 +78,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 +102,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 +120,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,6 +139,9 @@ 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)
@@ -131,8 +150,8 @@ static void run_fun(iochan_man_t man, IOCHAN p)
     {
         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);
         }
@@ -155,7 +174,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 +185,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 +199,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,8 +229,8 @@ 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--;
                 }
             }
@@ -222,9 +240,14 @@ 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 || p->destroyed)
+            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;
@@ -264,10 +287,11 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
            if (p->destroyed && p->thread_users == 0)
            {
                 *nextp = p->next;
+                xfree(p->name);
                 xfree(p);
-                break;
            }
-            nextp = &p->next;
+            else
+                nextp = &p->next;
         }
     }
     while (*iochans);