Remove redundant client_incref, client_destroy

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

diff --git a/src/eventl.c b/src/eventl.c
index 40f7a69..4992391 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <config.h>
 #endif
 
+#include <math.h>
 #include <stdio.h>
 #include <assert.h>
 
@@ -70,7 +71,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;
 }
 
@@ -86,6 +88,7 @@ void iochan_man_destroy(iochan_man_t *mp)
         while (c)
         {
             IOCHAN c_next = c->next;
+            xfree(c->name);
             xfree(c);
             c = c_next;
         }
@@ -101,7 +104,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;
 
@@ -113,17 +117,21 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
     new_iochan->fun = cb;
     new_iochan->socketfun = NULL;
     new_iochan->maskfun = NULL;
-    new_iochan->force_event = 0;
     new_iochan->last_event = new_iochan->max_idle = 0;
     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))
@@ -132,6 +140,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)
@@ -140,8 +151,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);
         }
@@ -157,7 +168,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
        IOCHAN p, *nextp;
        fd_set in, out, except;
        int res, max;
-       static struct timeval nullto = {0, 0}, to;
+       static struct timeval to;
        struct timeval *timeout;
 
        FD_ZERO(&in);
@@ -179,8 +190,6 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
                 to.tv_sec = p->max_idle;
             if (p->fd < 0)
                 continue;
-           if (p->force_event)
-               timeout = &nullto;        /* polling select */
            if (p->flags & EVENT_INPUT)
                FD_SET(p->fd, &in);
            if (p->flags & EVENT_OUTPUT)
@@ -194,10 +203,9 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
         {
             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)
@@ -220,46 +228,53 @@ 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->thread_users > 0 || p->destroyed)
+            if (p->destroyed)
             {
-                yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
+                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 name=%s users=%d", p, p->name ? p->name : "", p->thread_users);
                 continue;
             }
             p->this_event = 0;
-            p->force_event = 0;
 
-            if ((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)
             {
                 p->last_event = now;
                 p->this_event |= EVENT_TIMEOUT;
             }
             if (p->fd >= 0)
             {
-                if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
+                if (FD_ISSET(p->fd, &in))
                 {
                     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)
+                if (FD_ISSET(p->fd, &out))
                 {
                     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)
+                if (FD_ISSET(p->fd, &except))
                 {
                     p->last_event = now;
                     p->this_event |= EVENT_EXCEPT;
@@ -273,6 +288,7 @@ 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);
            }
             else
@@ -295,6 +311,18 @@ void iochan_man_events(iochan_man_t man)
     event_loop(man, &man->channel_list);
 }
 
+void pazpar2_sleep(double d)
+{
+#ifdef WIN32
+    Sleep( (DWORD) (d * 1000));
+#else
+    struct timeval tv;
+    tv.tv_sec = floor(d);
+    tv.tv_usec = (d - floor(d)) * 1000000;
+    select(0, 0, 0, 0, &tv);
+#endif
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4