X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=ba4ba599272e13c5a24f7e2addca3a0689ea55d7;hb=37ae4386bd764d62ae43c68df1560be55ff813ca;hp=e200e031fe80357c814f9262931be5da8745a844;hpb=774342ce8702375cef22d12c856c9479a719c827;p=pazpar2-moved-to-github.git diff --git a/src/eventl.c b/src/eventl.c index e200e03..ba4ba59 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -36,14 +36,9 @@ #include #include -#ifdef WIN32 -#include -#else +#if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_TIME_H -#include -#endif #include #include @@ -55,6 +50,7 @@ #include #include #include +#include #include "eventl.h" #include "sel_thread.h" @@ -108,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; @@ -122,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; } @@ -157,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) @@ -229,12 +265,10 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) IOCHAN start; IOCHAN inv_start; int res; - static struct timeval to; struct yaz_poll_fd *fds; int i, no_fds = 0; int connection_fired = 0; - to.tv_sec = 300; - to.tv_usec = 0; + int tv_sec = 300; yaz_mutex_enter(man->iochan_mutex); start = man->channel_list; @@ -260,13 +294,14 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) } for (p = start; p; p = p->next, i++) { + 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; - if (p->max_idle && p->max_idle < to.tv_sec) - to.tv_sec = p->max_idle; + if (p->max_idle && p->max_idle < tv_sec) + tv_sec = p->max_idle; if (p->fd < 0) continue; if (p->flags & EVENT_INPUT) @@ -275,9 +310,13 @@ 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); - res = yaz_poll(fds, no_fds, to.tv_sec, 0); + 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) { @@ -286,12 +325,12 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) else { yaz_log(YLOG_ERRNO | YLOG_WARN, "poll"); - return 0; + abort(); } } - i = 0; if (man->sel_fd != -1) { + i = 0; assert(fds[i].fd == man->sel_fd); if (fds[i].output_mask) { @@ -307,7 +346,6 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) chan->thread_users--; } } - i++; } if (man->log_level) { @@ -316,10 +354,10 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) no++; yaz_log(man->log_level, "%d channels", no); } - for (; i < no_fds; i++) + for (p = start; p; p = p->next) { time_t now = time(0); - p = fds[i].client_data; + i = p->poll_offset; if (p->destroyed) { @@ -341,7 +379,7 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) p->last_event = now; p->this_event |= EVENT_TIMEOUT; } - if (fds[i].fd >= 0) + if (fds[i].fd >= 0 && p->fd == fds[i].fd) { if (fds[i].output_mask & yaz_poll_read) { @@ -402,18 +440,6 @@ 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