#include <stdio.h>
#include <assert.h>
-#ifdef WIN32
-#include <winsock.h>
-#else
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
#include <stdlib.h>
#include <errno.h>
#include <yaz/xmalloc.h>
#include <yaz/mutex.h>
#include <yaz/poll.h>
+#include <sys/resource.h>
#include "eventl.h"
#include "sel_thread.h"
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);
+ yaz_log(YLOG_DEBUG, "%s iochans=%d",
+ delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
return iochans;
}
-int iochans_count(void) {
+int iochans_count(void)
+{
return iochan_use(0);
}
-int iochans_count_total(void) {
+int iochans_count_total(void)
+{
int total = 0;
if (!g_mutex)
return 0;
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;
man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
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;
}
return next;
}
-void iochan_man_destroy(iochan_man_t *mp) {
- if (*mp) {
+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;
(*mp)->channel_list = NULL;
yaz_mutex_leave((*mp)->iochan_mutex);
- while (c) {
+ while (c)
c = iochan_destroy_real(c);
- }
yaz_mutex_destroy(&(*mp)->iochan_mutex);
xfree((*mp)->fds);
xfree(*mp);
}
}
-void iochan_add(iochan_man_t man, IOCHAN chan) {
- chan->man = man;
- yaz_mutex_enter(man->iochan_mutex);
+int iochan_add(iochan_man_t man, IOCHAN chan, int slack)
+{
+ 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) {
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name)
+{
IOCHAN new_iochan;
if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
return new_iochan;
}
-static void work_handler(void *work_data) {
+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->name ? p->name : "", p->this_event);
}
-static void run_fun(iochan_man_t man, IOCHAN p) {
- if (man->sel_thread) {
+static void run_fun(iochan_man_t man, IOCHAN 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
+ }
+ else
work_handler(p);
}
-static int event_loop(iochan_man_t man, IOCHAN *iochans) {
+static int event_loop(iochan_man_t man, IOCHAN *iochans)
+{
do /* loop as long as there are active associations to process */
{
IOCHAN p, *nextp;
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;
-
- // INV: start must no change through the loop
+ int tv_sec = 300;
yaz_mutex_enter(man->iochan_mutex);
start = man->channel_list;
{
fds[i].fd = man->sel_fd;
fds[i].input_mask = yaz_poll_read;
+ fds[i].client_data = 0;
i++;
}
for (p = start; p; p = p->next, i++)
{
+ p->poll_offset = i;
+ fds[i].client_data = p;
+ 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;
- fds[i].fd = p->fd;
- fds[i].input_mask = 0;
+ if (p->max_idle && p->max_idle < tv_sec)
+ tv_sec = p->max_idle;
if (p->fd < 0)
continue;
if (p->flags & EVENT_INPUT)
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)
{
if (errno == EINTR)
continue;
- else {
+ 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)
{
yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
man->sel_fd);
- while ((chan = sel_thread_result(man->sel_thread))) {
+ while ((chan = sel_thread_result(man->sel_thread)))
+ {
yaz_log(man->log_level,
"eventl: got thread result chan=%p name=%s", chan,
chan->name ? chan->name : "");
chan->thread_users--;
}
}
- i++;
}
if (man->log_level)
{
no++;
yaz_log(man->log_level, "%d channels", no);
}
- for (p = start; p; p = p->next, i++)
+ for (p = start; p; p = p->next)
{
time_t now = time(0);
+ i = p->poll_offset;
if (p->destroyed)
{
continue;
}
p->this_event = 0;
-
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 (fds[i].fd >= 0 && p->fd == fds[i].fd)
{
- assert(fds[i].fd == p->fd);
if (fds[i].output_mask & yaz_poll_read)
{
p->last_event = now;
}
}
/* only fire one Z39.50/SRU socket event.. except for timeout */
- if (p->this_event) {
+ if (p->this_event)
+ {
if (!(p->this_event & EVENT_TIMEOUT) &&
!strcmp(p->name, "connection_socket"))
{
assert(inv_start == start);
yaz_mutex_enter(man->iochan_mutex);
- for (nextp = iochans; *nextp;) {
+ for (nextp = iochans; *nextp; )
+ {
IOCHAN p = *nextp;
- if (p->destroyed && p->thread_users == 0) {
+ if (p->destroyed && p->thread_users == 0)
*nextp = iochan_destroy_real(p);
- } else
+ else
nextp = &p->next;
}
yaz_mutex_leave(man->iochan_mutex);
return 0;
}
-void iochan_man_events(iochan_man_t man) {
- if (man->no_threads > 0 && !man->sel_thread) {
+void iochan_man_events(iochan_man_t man)
+{
+ if (man->no_threads > 0 && !man->sel_thread)
+ {
man->sel_thread = sel_thread_create(work_handler, 0 /*work_destroy */,
&man->sel_fd, man->no_threads);
yaz_log(man->log_level, "iochan_man_events. Using %d threads",
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
projects / pazpar2-moved-to-github.git / blobdiff