X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=ba4ba599272e13c5a24f7e2addca3a0689ea55d7;hb=37ae4386bd764d62ae43c68df1560be55ff813ca;hp=39c243a7b5c407f9a5d744603a241d900933818f;hpb=be1eadea83fa92186638cdbf7b014ac98cd5a039;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index 39c243a..ba4ba59 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -50,6 +50,7 @@
 #include <yaz/xmalloc.h>
 #include <yaz/mutex.h>
 #include <yaz/poll.h>
+#include <sys/resource.h>
 #include "eventl.h"
 #include "sel_thread.h"
 
@@ -103,10 +104,11 @@ struct iochan_man_s {
     int log_level;
     YAZ_MUTEX iochan_mutex;
     int size_fds;
+    int limit_fd;
     struct yaz_poll_fd *fds;
 };
 
-iochan_man_t iochan_man_create(int no_threads)
+iochan_man_t iochan_man_create(int no_threads, int max_sockets)
 {
     iochan_man_t man = xmalloc(sizeof(*man));
     man->channel_list = 0;
@@ -117,6 +119,20 @@ iochan_man_t iochan_man_create(int no_threads)
     man->iochan_mutex = 0;
     man->size_fds = 0;
     man->fds = 0;
+    man->limit_fd = 0;
+#if HAVE_GETRLIMIT
+    {
+        struct rlimit limit_data;
+        getrlimit(RLIMIT_NOFILE, &limit_data);
+        yaz_log(YLOG_LOG, "getrlimit NOFILE cur=%ld max=%ld",
+                (long) limit_data.rlim_cur, (long) limit_data.rlim_max);
+        man->limit_fd = limit_data.rlim_cur - 200;
+    }
+#endif
+    if (max_sockets)
+        man->limit_fd = max_sockets;
+    yaz_log(YLOG_LOG, "iochan threads %d limit fd %d", no_threads,
+            man->limit_fd);
     yaz_mutex_create(&man->iochan_mutex);
     return man;
 }
@@ -152,15 +168,40 @@ void iochan_man_destroy(iochan_man_t *mp)
     }
 }
 
-void iochan_add(iochan_man_t man, IOCHAN chan)
+int iochan_add(iochan_man_t man, IOCHAN chan, int slack)
 {
-    chan->man = man;
-    yaz_mutex_enter(man->iochan_mutex);
+    int r = 0, no_fds = 0;
+    IOCHAN p;
+
     yaz_log(man->log_level, "iochan_add : chan=%p channel list=%p", chan,
             man->channel_list);
-    chan->next = man->channel_list;
-    man->channel_list = chan;
+    yaz_mutex_enter(man->iochan_mutex);
+    for (p = man->channel_list; p; p = p->next)
+    {
+        if (p->fd >= 0)
+            no_fds++;
+    }
+    if (slack >= 0 && man->limit_fd > 0 && no_fds >= man->limit_fd - slack)
+    {
+        r = -1;
+        yaz_log(YLOG_WARN, "max channels %d in use", no_fds);
+    }
+    else
+    {
+        chan->man = man;
+        chan->next = man->channel_list;
+        man->channel_list = chan;
+    }
     yaz_mutex_leave(man->iochan_mutex);
+    return r;
+}
+
+void iochan_destroy(IOCHAN chan)
+{
+    if (chan->man)
+        chan->destroyed = 1;
+    else
+        iochan_destroy_real(chan);
 }
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name)
@@ -255,7 +296,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
         {
             p->poll_offset = i;
             fds[i].client_data = p;
-            fds[i].fd = p->fd;
+            fds[i].fd = -1;
             fds[i].input_mask = 0;
             if (p->thread_users > 0)
                 continue;
@@ -269,8 +310,12 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
                 fds[i].input_mask |= yaz_poll_write;
             if (p->flags & EVENT_EXCEPT)
                 fds[i].input_mask |= yaz_poll_except;
+            if (fds[i].input_mask)
+                fds[i].fd = p->fd;
         }
-        yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds);
+        assert(i == no_fds);
+        yaz_log(man->log_level, "yaz_poll begin tv_sec=%d nofds=%d", tv_sec,
+                no_fds);
         res = yaz_poll(fds, no_fds, tv_sec, 0);
         yaz_log(man->log_level, "yaz_poll returned res=%d", res);
         if (res < 0)
@@ -280,7 +325,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans)
             else
             {
                 yaz_log(YLOG_ERRNO | YLOG_WARN, "poll");
-                return 0;
+                abort();
             }
         }
         if (man->sel_fd != -1)