X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=8bc158b100d63a06ddbb8aaf1c1fdf4ed5da81d3;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=0f0d46bc20f15081d3e459063e20525647e8c30f;hpb=682faf92e6963c1b70a3b16da9bf34373cc7a4be;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index 0f0d46b..8bc158b 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) Index Data
 
  Pazpar2 is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free
@@ -20,7 +20,7 @@
 /*
  * Based on  ParaZ - a simple tool for harvesting performance data for
  * parallel operations using Z39.50.
- * Copyright (C) 2006-2010 Index Data ApS
+ * Copyright (C) Index Data ApS
  * See LICENSE file for details.
  */
 
@@ -58,6 +58,45 @@
 #include "eventl.h"
 #include "sel_thread.h"
 
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_iochans = 0;
+static int no_iochans_total = 0;
+
+static int iochan_use(int delta)
+{
+    int iochans;
+    if (!g_mutex)
+        yaz_mutex_create(&g_mutex);
+    yaz_mutex_enter(g_mutex);
+    no_iochans += delta;
+    if (delta > 0)
+        no_iochans_total += delta;
+    iochans = no_iochans;
+    yaz_mutex_leave(g_mutex);
+    yaz_log(YLOG_DEBUG, "%s iochans=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
+    return iochans;
+}
+
+int  iochans_count(void) {
+    return iochan_use(0);
+}
+
+int  iochans_count_total(void) {
+    int total = 0;
+    if (!g_mutex)
+        return 0;
+    yaz_mutex_enter(g_mutex);
+    total = no_iochans_total;
+    yaz_mutex_leave(g_mutex);
+    return total;
+}
+#else
+#define iochan_use(x)
+#define iochans_count(x) 0
+#define iochans_count_total(x) 0
+#endif
+
 struct iochan_man_s {
     IOCHAN channel_list;
     sel_thread_t sel_thread;
@@ -79,6 +118,16 @@ iochan_man_t iochan_man_create(int no_threads) {
     return man;
 }
 
+IOCHAN iochan_destroy_real(IOCHAN chan)
+{
+    IOCHAN next = chan->next;
+    if (chan->name)
+        xfree(chan->name);
+    xfree(chan);
+    iochan_use(-1);
+    return next;
+}
+
 void iochan_man_destroy(iochan_man_t *mp) {
     if (*mp) {
         IOCHAN c;
@@ -90,11 +139,9 @@ void iochan_man_destroy(iochan_man_t *mp) {
         (*mp)->channel_list = NULL;
         yaz_mutex_leave((*mp)->iochan_mutex);
         while (c) {
-            IOCHAN c_next = c->next;
-            xfree(c->name);
-            xfree(c);
-            c = c_next;
+            c = iochan_destroy_real(c);
         }
+        yaz_mutex_destroy(&(*mp)->iochan_mutex);
         xfree(*mp);
         *mp = 0;
     }
@@ -115,6 +162,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) {
 
     if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
         return 0;
+    iochan_use(1);
     new_iochan->destroyed = 0;
     new_iochan->fd = fd;
     new_iochan->flags = flags;
@@ -147,16 +195,14 @@ static void work_handler(void *work_data) {
 }
 
 static void run_fun(iochan_man_t man, IOCHAN p) {
-    if (p->this_event) {
-        if (man->sel_thread) {
-            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);
-        } else
-            work_handler(p);
-    }
+    if (man->sel_thread) {
+        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);
+    } else
+        work_handler(p);
 }
 
 static int event_loop(iochan_man_t man, IOCHAN *iochans) {
@@ -171,7 +217,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
         struct timeval *timeout;
 
 //        struct yaz_poll_fd *fds;
-        int no_fds = 0;
+        int i, no_fds = 0;
         FD_ZERO(&in);
         FD_ZERO(&out);
         FD_ZERO(&except);
@@ -207,7 +253,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
             if (p->fd > max)
                 max = p->fd;
         }
-        yaz_log(man->log_level, "max=%d nofds=%d", max, man->sel_fd);
+        yaz_log(man->log_level, "max=%d sel_fd=%d", max, man->sel_fd);
 
         if (man->sel_fd != -1) {
             if (man->sel_fd > max)
@@ -246,6 +292,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
             }
             yaz_log(man->log_level, "%d channels", no);
         }
+        i = 0;
         for (p = start; p; p = p->next) {
             time_t now = time(0);
 
@@ -281,16 +328,24 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
                     p->this_event |= EVENT_EXCEPT;
                 }
             }
-            run_fun(man, p);
+            /* only fire one Z39.50/SRU socket event.. except for timeout */
+            if (p->this_event) {
+                if (!(p->this_event & EVENT_TIMEOUT) &&
+                    !strcmp(p->name, "connection_socket")) {
+                    /* not a timeout and we have a Z39.50/SRU socket */
+                    if (i == 0)
+                        run_fun(man, p);
+                    i++;
+                } else
+                    run_fun(man, p);
+            }
         }
         assert(inv_start == start);
         yaz_mutex_enter(man->iochan_mutex);
         for (nextp = iochans; *nextp;) {
             IOCHAN p = *nextp;
             if (p->destroyed && p->thread_users == 0) {
-                *nextp = p->next;
-                xfree(p->name);
-                xfree(p);
+                *nextp = iochan_destroy_real(p);
             } else
                 nextp = &p->next;
         }