X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=499239143dd6463d5bc02a78a0f6b69512f8bced;hb=aa698bfd22b2ead2ee2c73b330806f7f7c161bfb;hp=870d089390b7b7e2111698b52e145d5974d3ecdc;hpb=43696f40bf1d08065a96a175d5b81ecfff78d507;p=pazpar2-moved-to-github.git diff --git a/src/eventl.c b/src/eventl.c index 870d089..4992391 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include #include #include @@ -60,6 +61,7 @@ struct iochan_man_s { sel_thread_t sel_thread; int sel_fd; int no_threads; + int log_level; }; iochan_man_t iochan_man_create(int no_threads) @@ -69,6 +71,8 @@ iochan_man_t iochan_man_create(int no_threads) 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 = yaz_log_module_level("iochan"); + return man; } @@ -76,8 +80,18 @@ 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; + while (c) + { + IOCHAN c_next = c->next; + xfree(c->name); + xfree(c); + c = c_next; + } xfree(*mp); *mp = 0; } @@ -90,7 +104,8 @@ void iochan_add(iochan_man_t man, IOCHAN chan) man->channel_list = chan; } -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; @@ -102,34 +117,47 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int 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); } } @@ -137,17 +165,17 @@ 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; + static struct timeval to; struct timeval *timeout; 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) @@ -158,10 +186,10 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) 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) @@ -170,19 +198,16 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) 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; } 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) @@ -199,75 +224,76 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { 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 = *iochans; p; p = p->next) + no++; + yaz_log(man->log_level, "%d channels", no); + } + for (p = *iochans; p; p = p->next) + { + 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); + } + 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; + } } while (*iochans); return 0; @@ -279,12 +305,24 @@ void iochan_man_events(iochan_man_t man) { man->sel_thread = sel_thread_create( work_handler, 0 /*work_destroy */, &man->sel_fd, man->no_threads); - yaz_log(YLOG_LOG, "iochan_man_events. Using %d 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