X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=990dbfe0afd4f622cafd6c15c7bb4f5a28ca6957;hb=f5ad1c6741bb46b5d363143c937ca0266ee67f35;hp=a263c6435996b74ab6270a35ec9a0e113cb5f4ee;hpb=2ee54f76ebb2510e313a0ad34d09a23d0d9c23ae;p=pazpar2-moved-to-github.git diff --git a/src/eventl.c b/src/eventl.c index a263c64..990dbfe 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 @@ -52,6 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include "eventl.h" #include "sel_thread.h" @@ -61,6 +63,13 @@ struct iochan_man_s { int sel_fd; int no_threads; int log_level; + YAZ_MUTEX iochan_mutex; +}; + +struct iochan_man_iter { + iochan_man_t man; + IOCHAN current; + int first; }; iochan_man_t iochan_man_create(int no_threads) @@ -70,7 +79,9 @@ 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 = YLOG_DEBUG; + man->log_level = yaz_log_module_level("iochan"); + man->iochan_mutex = 0; + yaz_mutex_create(&man->iochan_mutex); return man; } @@ -78,8 +89,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; } @@ -88,11 +109,15 @@ void iochan_man_destroy(iochan_man_t *mp) 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; @@ -102,19 +127,21 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags) 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; + + 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)) @@ -123,16 +150,19 @@ static void work_handler(void *work_data) (*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) { - if (!p->destroyed && p->this_event) + if (p->this_event) { if (man->sel_thread) { - yaz_log(man->log_level, "eventl: add fun chan=%p event=%d", - p, p->this_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); } @@ -141,35 +171,59 @@ static void run_fun(iochan_man_t man, IOCHAN 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) @@ -178,17 +232,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; } + 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(man->log_level, "select on sel fd=%d", man->sel_fd); FD_SET(man->sel_fd, &in); } - yaz_log(man->log_level, "select begin"); + yaz_log(man->log_level, "select begin nofds=%d", max); res = select(max + 1, &in, &out, &except, timeout); yaz_log(man->log_level, "select returned res=%d", res); if (res < 0) @@ -211,48 +264,54 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) man->sel_fd); while ((chan = sel_thread_result(man->sel_thread))) { - yaz_log(man->log_level, "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) + 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)) { - int force_event = p->force_event; 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->thread_users > 0) { - yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users); + 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; - p->force_event = 0; - if (!p->destroyed && ((p->max_idle && now - p->last_event > - p->max_idle) || force_event == EVENT_TIMEOUT)) + + 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 (!p->destroyed && (FD_ISSET(p->fd, &in) || - force_event == EVENT_INPUT)) + if (FD_ISSET(p->fd, &in)) { p->last_event = now; - yaz_log(YLOG_DEBUG, "Eventl input event"); p->this_event |= EVENT_INPUT; } - if (!p->destroyed && (FD_ISSET(p->fd, &out) || - force_event == EVENT_OUTPUT)) + if (FD_ISSET(p->fd, &out)) { p->last_event = now; - yaz_log(YLOG_DEBUG, "Eventl output event"); p->this_event |= EVENT_OUTPUT; } - if (!p->destroyed && (FD_ISSET(p->fd, &except) || - force_event == EVENT_EXCEPT)) + if (FD_ISSET(p->fd, &except)) { p->last_event = now; p->this_event |= EVENT_EXCEPT; @@ -260,30 +319,20 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) } run_fun(man, p); } - for (p = *iochans; p; p = nextp) - { - nextp = p->next; - + 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; @@ -301,6 +350,18 @@ void iochan_man_events(iochan_man_t man) 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