#include <config.h>
#endif
+#include <math.h>
#include <stdio.h>
#include <assert.h>
#include <yaz/log.h>
#include <yaz/comstack.h>
#include <yaz/xmalloc.h>
+#include <yaz/mutex.h>
#include "eventl.h"
#include "sel_thread.h"
IOCHAN channel_list;
sel_thread_t sel_thread;
int sel_fd;
- int use_threads;
+ int no_threads;
+ int log_level;
+ YAZ_MUTEX iochan_mutex;
};
-iochan_man_t iochan_man_create(int use_threads)
+struct iochan_man_iter {
+ iochan_man_t man;
+ IOCHAN current;
+ int first;
+};
+
+iochan_man_t iochan_man_create(int no_threads)
{
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->sel_fd = -1;
- man->use_threads = use_threads;
+ man->no_threads = no_threads;
+ man->log_level = yaz_log_module_level("iochan");
+ man->iochan_mutex = 0;
+ yaz_mutex_create(&man->iochan_mutex);
return man;
}
{
if (*mp)
{
+ IOCHAN c;
if ((*mp)->sel_thread)
sel_thread_destroy((*mp)->sel_thread);
+
+ c = (*mp)->channel_list;
+ while (c)
+ {
+ IOCHAN c_next = c->next;
+ xfree(c->name);
+ xfree(c);
+ c = c_next;
+ }
xfree(*mp);
*mp = 0;
}
void iochan_add(iochan_man_t man, IOCHAN chan)
{
chan->man = man;
+ yaz_mutex_enter(man->iochan_mutex);
+ 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_leave(man->iochan_mutex);
}
-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;
new_iochan->fd = fd;
new_iochan->flags = 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;
- (*p->fun)(p, p->this_event);
+
+ 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))
+ (*p->fun)(p, EVENT_INPUT);
+ if (!p->destroyed && (p->this_event & EVENT_OUTPUT))
+ (*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, int event)
+static void run_fun(iochan_man_t man, IOCHAN p)
{
- if (!p->destroyed)
+ if (p->this_event)
{
- p->this_event = event;
if (man->sel_thread)
{
- yaz_log(YLOG_LOG, "eventl: add fun chan=%p event=%d",
- p, 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);
}
else
- (*p->fun)(p, p->this_event);
+ work_handler(p);
}
}
+static IOCHAN iochan_man_get_first(struct iochan_man_iter *iter, iochan_man_t man) {
+ iter->man = man;
+ iter->first = 1;
+ yaz_mutex_enter(man->iochan_mutex);
+ iter->current = man->channel_list;
+ yaz_log(man->log_level, "iochan_man_get_first : chan=%p ", iter->current);
+ if (!iter->current)
+ yaz_mutex_leave(man->iochan_mutex);
+ return iter->current;
+}
+
+static IOCHAN iochan_man_get_next(struct iochan_man_iter *iter) {
+ IOCHAN current = NULL, next = NULL;
+ current = iter->current;
+ assert(current);
+ if (current) {
+ next = current->next;
+ iter->current = iter->current->next;
+ if (iter->first) {
+ yaz_log(iter->man->log_level, "iochan_man_get_next : chan=%p next=%p", current, next);
+ iter->first = 0;
+ yaz_mutex_leave(iter->man->iochan_mutex);
+ }
+ }
+ return iter->current;
+}
+
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 p, *nextp;
fd_set in, out, except;
int res, max;
- static struct timeval nullto = {0, 0}, to;
- struct timeval *timeout;
+ static struct timeval to;
+ struct timeval *timeout;
+ static struct iochan_man_iter iter;
FD_ZERO(&in);
FD_ZERO(&out);
FD_ZERO(&except);
timeout = &to; /* hang on select */
- to.tv_sec = 15;
+ to.tv_sec = 300;
to.tv_usec = 0;
max = 0;
- for (p = *iochans; p; p = p->next)
+ for (p = iochan_man_get_first(&iter, man); p; p = iochan_man_get_next(&iter) )
{
if (p->thread_users > 0)
continue;
- if (p->maskfun)
- p->flags = (*p->maskfun)(p);
- if (p->socketfun)
- p->fd = (*p->socketfun)(p);
+ if (p->max_idle && p->max_idle < to.tv_sec)
+ 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)
FD_SET(p->fd, &except);
if (p->fd > max)
max = p->fd;
- if (p->max_idle && p->max_idle < to.tv_sec)
- to.tv_sec = p->max_idle;
}
+ yaz_log(man->log_level, "max=%d nofds=%d", max, man->sel_fd);
+
if (man->sel_fd != -1)
{
if (man->sel_fd > max)
max = man->sel_fd;
- yaz_log(YLOG_LOG, "select on sel fd=%d", man->sel_fd);
FD_SET(man->sel_fd, &in);
}
- yaz_log(YLOG_LOG, "select begin");
+ yaz_log(man->log_level, "select begin nofds=%d", max);
res = select(max + 1, &in, &out, &except, timeout);
- yaz_log(YLOG_LOG, "select returned res=%d", res);
+ yaz_log(man->log_level, "select returned res=%d", res);
if (res < 0)
{
if (errno == EINTR)
{
IOCHAN chan;
- yaz_log(YLOG_LOG, "eventl: sel input on sel_fd=%d",
+ yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
man->sel_fd);
while ((chan = sel_thread_result(man->sel_thread)))
{
- yaz_log(YLOG_LOG, "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--;
}
}
}
- for (p = *iochans; p; p = p->next)
- {
- int force_event = p->force_event;
- time_t now = time(0);
-
- p->force_event = 0;
- if (!p->destroyed && ((p->max_idle && now - p->last_event >
- p->max_idle) || force_event == EVENT_TIMEOUT))
- {
- p->last_event = now;
- run_fun(man, p, EVENT_TIMEOUT);
- }
- if (p->fd < 0)
+ if (man->log_level)
+ {
+ int no = 0;
+ for (p = iochan_man_get_first(&iter, man); p; p = iochan_man_get_next(&iter)) {
+ no++;
+ }
+ yaz_log(man->log_level, "%d channels", no);
+ }
+ for (p = iochan_man_get_first(&iter, man); p; p = iochan_man_get_next(&iter))
+ {
+ time_t now = time(0);
+
+ if (p->destroyed)
+ {
+ yaz_log(man->log_level, "eventl: skip destroyed chan=%p name=%s", p, p->name ? p->name : "");
continue;
- if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
- force_event == EVENT_INPUT))
- {
- p->last_event = now;
- yaz_log(YLOG_DEBUG, "Eventl input event");
- run_fun(man, p, EVENT_INPUT);
- }
- if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
- force_event == EVENT_OUTPUT))
- {
- p->last_event = now;
- yaz_log(YLOG_DEBUG, "Eventl output event");
- run_fun(man, p, EVENT_OUTPUT);
- }
- if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
- force_event == EVENT_EXCEPT))
- {
- p->last_event = now;
- run_fun(man, p, EVENT_EXCEPT);
- }
- }
- for (p = *iochans; p; p = nextp)
- {
- nextp = p->next;
+ }
+ 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;
- if (p->destroyed)
+ 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))
+ {
+ p->last_event = now;
+ p->this_event |= EVENT_INPUT;
+ }
+ if (FD_ISSET(p->fd, &out))
+ {
+ p->last_event = now;
+ p->this_event |= EVENT_OUTPUT;
+ }
+ if (FD_ISSET(p->fd, &except))
+ {
+ p->last_event = now;
+ p->this_event |= EVENT_EXCEPT;
+ }
+ }
+ run_fun(man, p);
+ }
+ yaz_mutex_enter(man->iochan_mutex);
+ for (nextp = iochans; *nextp; )
+ {
+ IOCHAN p = *nextp;
+ if (p->destroyed && p->thread_users == 0)
{
- IOCHAN tmp = p, pr;
-
- /* Now reset the pointers */
- if (p == *iochans)
- *iochans = p->next;
- else
- {
- for (pr = *iochans; pr; pr = pr->next)
- if (pr->next == p)
- break;
- assert(pr); /* grave error if it weren't there */
- pr->next = p->next;
- }
- if (nextp == p)
- nextp = p->next;
- xfree(tmp);
+ *nextp = p->next;
+ xfree(p->name);
+ xfree(p);
}
- }
+ else
+ nextp = &p->next;
+ }
+ yaz_mutex_leave(man->iochan_mutex);
}
while (*iochans);
return 0;
void iochan_man_events(iochan_man_t man)
{
- if (man->use_threads && !man->sel_thread)
+ if (man->no_threads > 0 && !man->sel_thread)
{
man->sel_thread = sel_thread_create(
- work_handler, 0 /*work_destroy */, &man->sel_fd, 10);
- yaz_log(YLOG_LOG, "iochan_man_events. sel_thread started");
+ work_handler, 0 /*work_destroy */, &man->sel_fd, man->no_threads);
+ yaz_log(man->log_level, "iochan_man_events. Using %d threads",
+ man->no_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