From: Adam Dickmeiss Date: Wed, 27 Jan 2010 15:52:08 +0000 (+0100) Subject: Highly experimental boss-worker socket handler X-Git-Tag: v1.4.0~150 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=80efa0b009565fd772664f177dcd56af81e186a1;p=pazpar2-moved-to-github.git Highly experimental boss-worker socket handler The eventl.h from old GFS/paraz is extended a bit. Socket notications are sent via queues to a set of workers. Uses sel_thread. Currently test_sel_thread passes.. Which itself tests sel_thread based on an event handler that is ALSO using eventl. Now passes .. albeit the work-flow gives me the creeps. --- diff --git a/src/eventl.c b/src/eventl.c index 1251dfe..3a74751 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -53,15 +53,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include "eventl.h" +#include "sel_thread.h" struct iochan_man_s { IOCHAN channel_list; + sel_thread_t sel_thread; + int sel_fd; + int use_threads; }; -iochan_man_t iochan_man_create(void) +iochan_man_t iochan_man_create(int use_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; return man; } @@ -69,6 +76,8 @@ void iochan_man_destroy(iochan_man_t *mp) { if (*mp) { + if ((*mp)->sel_thread) + sel_thread_destroy((*mp)->sel_thread); xfree(*mp); *mp = 0; } @@ -76,6 +85,7 @@ void iochan_man_destroy(iochan_man_t *mp) void iochan_add(iochan_man_t man, IOCHAN chan) { + chan->man = man; chan->next = man->channel_list; man->channel_list = chan; } @@ -95,10 +105,35 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags) 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; + (*p->fun)(p, p->this_event); +} + +static void run_fun(iochan_man_t man, IOCHAN p, int event) +{ + if (!p->destroyed) + { + p->this_event = event; + if (man->sel_thread) + { + yaz_log(YLOG_LOG, "eventl: add fun chan=%p event=%d", + p, event); + p->thread_users++; + sel_thread_add(man->sel_thread, p); + } + else + (*p->fun)(p, p->this_event); + } +} + +static int event_loop(iochan_man_t man, IOCHAN *iochans) { do /* loop as long as there are active associations to process */ { @@ -117,6 +152,8 @@ static int event_loop(IOCHAN *iochans) 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) @@ -136,7 +173,16 @@ static int event_loop(IOCHAN *iochans) 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(YLOG_LOG, "select on sel fd=%d", man->sel_fd); + FD_SET(man->sel_fd, &in); + } + yaz_log(YLOG_LOG, "select begin"); + res = select(max + 1, &in, &out, &except, timeout); + yaz_log(YLOG_LOG, "select returned res=%d", res); if (res < 0) { if (errno == EINTR) @@ -147,6 +193,22 @@ static int event_loop(IOCHAN *iochans) return 0; } } + if (man->sel_fd != -1) + { + if (FD_ISSET(man->sel_fd, &in)) + { + IOCHAN chan; + + yaz_log(YLOG_LOG, "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); + chan->thread_users--; + } + } + } for (p = *iochans; p; p = p->next) { int force_event = p->force_event; @@ -157,7 +219,7 @@ static int event_loop(IOCHAN *iochans) p->max_idle) || force_event == EVENT_TIMEOUT)) { p->last_event = now; - (*p->fun)(p, EVENT_TIMEOUT); + run_fun(man, p, EVENT_TIMEOUT); } if (p->fd < 0) continue; @@ -166,20 +228,20 @@ static int event_loop(IOCHAN *iochans) { p->last_event = now; yaz_log(YLOG_DEBUG, "Eventl input event"); - (*p->fun)(p, EVENT_INPUT); + 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"); - (*p->fun)(p, EVENT_OUTPUT); + run_fun(man, p, EVENT_OUTPUT); } if (!p->destroyed && (FD_ISSET(p->fd, &except) || force_event == EVENT_EXCEPT)) { p->last_event = now; - (*p->fun)(p, EVENT_EXCEPT); + run_fun(man, p, EVENT_EXCEPT); } } for (p = *iochans; p; p = nextp) @@ -213,7 +275,13 @@ static int event_loop(IOCHAN *iochans) void iochan_man_events(iochan_man_t man) { - event_loop(&man->channel_list); + if (man->use_threads && !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"); + } + event_loop(man, &man->channel_list); } /* diff --git a/src/eventl.h b/src/eventl.h index 1e3852e..442684e 100644 --- a/src/eventl.h +++ b/src/eventl.h @@ -28,6 +28,8 @@ typedef void (*IOC_CALLBACK)(struct iochan *i, int event); typedef int (*IOC_SOCKETFUN)(struct iochan *i); typedef int (*IOC_MASKFUN)(struct iochan *i); +typedef struct iochan_man_s *iochan_man_t; + typedef struct iochan { int fd; @@ -44,13 +46,16 @@ typedef struct iochan int destroyed; time_t last_event; time_t max_idle; - + int this_event; + int thread_users; + + iochan_man_t man; + struct iochan *next; } *IOCHAN; -typedef struct iochan_man_s *iochan_man_t; -iochan_man_t iochan_man_create(void); +iochan_man_t iochan_man_create(int use_threads); void iochan_add(iochan_man_t man, IOCHAN chan); void iochan_man_events(iochan_man_t man); void iochan_man_destroy(iochan_man_t *mp); diff --git a/src/logic.c b/src/logic.c index 598b815..d4db2e1 100644 --- a/src/logic.c +++ b/src/logic.c @@ -812,7 +812,7 @@ static iochan_man_t pazpar2_chan_man = 0; /* thread pr */ void pazpar2_chan_man_start(void) { - pazpar2_chan_man = iochan_man_create(); + pazpar2_chan_man = iochan_man_create(0 /* use threads */); } void pazpar2_add_channel(IOCHAN chan) diff --git a/src/test_sel_thread.c b/src/test_sel_thread.c index 5c5eef5..d54059d 100644 --- a/src/test_sel_thread.c +++ b/src/test_sel_thread.c @@ -107,7 +107,7 @@ static void test_for_real_work(int no_threads) YAZ_CHECK(p); if (p) { - iochan_man_t chan_man = iochan_man_create(); + iochan_man_t chan_man = iochan_man_create(1 /* use_threads */); IOCHAN chan = iochan_create(thread_fd, iochan_handler, EVENT_INPUT|EVENT_TIMEOUT); iochan_settimeout(chan, 1);