#include <yaz/comstack.h>
#include <yaz/xmalloc.h>
#include "eventl.h"
+#include "sel_thread.h"
struct iochan_man_s {
IOCHAN channel_list;
+ sel_thread_t sel_thread;
+ int sel_fd;
+ int no_threads;
+ int log_level;
};
-iochan_man_t iochan_man_create(void)
+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->no_threads = no_threads;
+ man->log_level = YLOG_DEBUG;
return man;
}
{
if (*mp)
{
+ if ((*mp)->sel_thread)
+ sel_thread_destroy((*mp)->sel_thread);
xfree(*mp);
*mp = 0;
}
void iochan_add(iochan_man_t man, IOCHAN chan)
{
+ chan->man = man;
chan->next = man->channel_list;
man->channel_list = chan;
}
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;
return new_iochan;
}
-static int event_loop(IOCHAN *iochans)
+static void work_handler(void *work_data)
+{
+ IOCHAN p = work_data;
+ 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);
+}
+
+static void run_fun(iochan_man_t man, IOCHAN p)
+{
+ if (p->this_event)
+ {
+ if (man->sel_thread)
+ {
+ yaz_log(man->log_level, "eventl: add fun chan=%p event=%d",
+ p, 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)
{
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;
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)
{
+ 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)
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;
}
- res = select(max + 1, &in, &out, &except, timeout);
+ if (man->sel_fd != -1)
+ {
+ if (man->sel_fd > max)
+ max = man->sel_fd;
+ yaz_log(man->log_level, "select on sel fd=%d", man->sel_fd);
+ FD_SET(man->sel_fd, &in);
+ }
+ yaz_log(man->log_level, "select begin");
+ res = select(max + 1, &in, &out, &except, timeout);
+ yaz_log(man->log_level, "select returned res=%d", res);
if (res < 0)
{
if (errno == EINTR)
return 0;
}
}
- for (p = *iochans; p; p = p->next)
- {
- int force_event = p->force_event;
- time_t now = time(0);
+ if (man->sel_fd != -1)
+ {
+ if (FD_ISSET(man->sel_fd, &in))
+ {
+ IOCHAN chan;
- 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;
- (*p->fun)(p, EVENT_TIMEOUT);
- }
- if (p->fd < 0)
+ 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(man->log_level, "eventl: got thread result p=%p",
+ chan);
+ chan->thread_users--;
+ }
+ }
+ }
+ for (p = *iochans; p; p = p->next)
+ {
+ int force_event = p->force_event;
+ time_t now = time(0);
+
+ if (p->thread_users > 0 || p->destroyed)
+ {
+ yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
continue;
- if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
- force_event == EVENT_INPUT))
- {
- p->last_event = now;
- yaz_log(YLOG_DEBUG, "Eventl input event");
- (*p->fun)(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");
- (*p->fun)(p, EVENT_OUTPUT);
- }
- if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
- force_event == EVENT_EXCEPT))
- {
- p->last_event = now;
- (*p->fun)(p, EVENT_EXCEPT);
- }
- }
- for (p = *iochans; p; p = nextp)
- {
- nextp = p->next;
+ }
+ p->this_event = 0;
+ p->force_event = 0;
- if (p->destroyed)
+ if ((p->max_idle && now - p->last_event > p->max_idle)
+ || force_event == EVENT_TIMEOUT)
+ {
+ p->last_event = now;
+ p->this_event |= EVENT_TIMEOUT;
+ }
+ if (p->fd >= 0)
+ {
+ if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
+ {
+ p->last_event = now;
+ yaz_log(YLOG_DEBUG, "Eventl input event");
+ p->this_event |= EVENT_INPUT;
+ }
+ if (FD_ISSET(p->fd, &out) || force_event == EVENT_OUTPUT)
+ {
+ p->last_event = now;
+ yaz_log(YLOG_DEBUG, "Eventl output event");
+ p->this_event |= EVENT_OUTPUT;
+ }
+ if (FD_ISSET(p->fd, &except) || force_event == EVENT_EXCEPT)
+ {
+ p->last_event = now;
+ p->this_event |= EVENT_EXCEPT;
+ }
+ }
+ run_fun(man, p);
+ }
+ 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);
}
- }
+ else
+ nextp = &p->next;
+ }
}
while (*iochans);
return 0;
void iochan_man_events(iochan_man_t man)
{
- event_loop(&man->channel_list);
+ 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",
+ man->no_threads);
+ }
+ event_loop(man, &man->channel_list);
}
/*
projects / pazpar2-moved-to-github.git / blobdiff