X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=40dfeb472bc556afd0524be1eeff688520450e92;hb=c4a0e7bd9ac4994ad56c637945c55aeb8bfe2c9c;hp=840b735479a9c0ace0bb1caa3b22bebd87830337;hpb=3c83516283deb5286ecaf72411fc150c8e2eee20;p=pazpar2-moved-to-github.git diff --git a/src/eventl.c b/src/eventl.c index 840b735..40dfeb4 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2011 Index Data + Copyright (C) Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -20,7 +20,7 @@ /* * Based on ParaZ - a simple tool for harvesting performance data for * parallel operations using Z39.50. - * Copyright (C) 2006-2011 Index Data ApS + * Copyright (C) Index Data ApS * See LICENSE file for details. */ @@ -36,14 +36,9 @@ #include #include -#ifdef WIN32 -#include -#else +#if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_TIME_H -#include -#endif #include #include @@ -74,15 +69,18 @@ static int iochan_use(int delta) no_iochans_total += delta; iochans = no_iochans; yaz_mutex_leave(g_mutex); - yaz_log(YLOG_DEBUG, "%s iochans=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans); + yaz_log(YLOG_DEBUG, "%s iochans=%d", + delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans); return iochans; } -int iochans_count(void) { +int iochans_count(void) +{ return iochan_use(0); } -int iochans_count_total(void) { +int iochans_count_total(void) +{ int total = 0; if (!g_mutex) return 0; @@ -104,9 +102,12 @@ struct iochan_man_s { int no_threads; int log_level; YAZ_MUTEX iochan_mutex; + int size_fds; + struct yaz_poll_fd *fds; }; -iochan_man_t iochan_man_create(int no_threads) { +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 */ @@ -114,6 +115,8 @@ iochan_man_t iochan_man_create(int no_threads) { man->no_threads = no_threads; man->log_level = yaz_log_module_level("iochan"); man->iochan_mutex = 0; + man->size_fds = 0; + man->fds = 0; yaz_mutex_create(&man->iochan_mutex); return man; } @@ -123,13 +126,15 @@ IOCHAN iochan_destroy_real(IOCHAN chan) IOCHAN next = chan->next; if (chan->name) xfree(chan->name); - xfree(free); + xfree(chan); iochan_use(-1); return next; } -void iochan_man_destroy(iochan_man_t *mp) { - if (*mp) { +void iochan_man_destroy(iochan_man_t *mp) +{ + if (*mp) + { IOCHAN c; if ((*mp)->sel_thread) sel_thread_destroy((*mp)->sel_thread); @@ -138,16 +143,17 @@ void iochan_man_destroy(iochan_man_t *mp) { c = (*mp)->channel_list; (*mp)->channel_list = NULL; yaz_mutex_leave((*mp)->iochan_mutex); - while (c) { + while (c) c = iochan_destroy_real(c); - } yaz_mutex_destroy(&(*mp)->iochan_mutex); + xfree((*mp)->fds); xfree(*mp); *mp = 0; } } -void iochan_add(iochan_man_t man, IOCHAN chan) { +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, @@ -157,7 +163,8 @@ void iochan_add(iochan_man_t man, IOCHAN chan) { yaz_mutex_leave(man->iochan_mutex); } -IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) { +IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) +{ IOCHAN new_iochan; if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan)))) @@ -175,7 +182,8 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) { return new_iochan; } -static void work_handler(void *work_data) { +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", @@ -194,92 +202,103 @@ static void work_handler(void *work_data) { p->name ? p->name : "", p->this_event); } -static void run_fun(iochan_man_t man, IOCHAN p) { - if (p->this_event) { - if (man->sel_thread) { - 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 - work_handler(p); +static void run_fun(iochan_man_t man, IOCHAN p) +{ + if (man->sel_thread) + { + 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 + work_handler(p); } -static int event_loop(iochan_man_t man, IOCHAN *iochans) { +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 start; IOCHAN inv_start; - fd_set in, out, except; - int res, max; - static struct timeval to; - struct timeval *timeout; - -// struct yaz_poll_fd *fds; - int no_fds = 0; - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); - timeout = &to; /* hang on select */ - to.tv_sec = 300; - to.tv_usec = 0; - - // INV: start must no change through the loop + int res; + struct yaz_poll_fd *fds; + int i, no_fds = 0; + int connection_fired = 0; + int tv_sec = 300; yaz_mutex_enter(man->iochan_mutex); start = man->channel_list; yaz_mutex_leave(man->iochan_mutex); inv_start = start; - for (p = start; p; p = p->next) { + for (p = start; p; p = p->next) no_fds++; + if (man->sel_fd != -1) + no_fds++; + if (no_fds > man->size_fds) + { + man->size_fds = no_fds * 2; + man->fds = xrealloc(man->fds, man->size_fds * sizeof(*man->fds)); } -// fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); - - max = 0; - for (p = start; p; p = p->next) { + fds = man->fds; + i = 0; + if (man->sel_fd != -1) + { + fds[i].fd = man->sel_fd; + fds[i].input_mask = yaz_poll_read; + fds[i].client_data = 0; + i++; + } + for (p = start; p; p = p->next, i++) + { + p->poll_offset = i; + fds[i].client_data = p; + fds[i].fd = -1; + fds[i].input_mask = 0; if (p->thread_users > 0) continue; - if (p->max_idle && p->max_idle < to.tv_sec) - to.tv_sec = p->max_idle; + if (p->max_idle && p->max_idle < tv_sec) + tv_sec = p->max_idle; if (p->fd < 0) continue; if (p->flags & EVENT_INPUT) - FD_SET(p->fd, &in); + fds[i].input_mask |= yaz_poll_read; if (p->flags & EVENT_OUTPUT) - FD_SET(p->fd, &out); + fds[i].input_mask |= yaz_poll_write; if (p->flags & EVENT_EXCEPT) - FD_SET(p->fd, &except); - if (p->fd > max) - max = p->fd; - } - yaz_log(man->log_level, "max=%d sel_fd=%d", max, man->sel_fd); - - if (man->sel_fd != -1) { - if (man->sel_fd > max) - max = man->sel_fd; - FD_SET(man->sel_fd, &in); + fds[i].input_mask |= yaz_poll_except; + if (fds[i].input_mask) + fds[i].fd = p->fd; } - 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) { + assert(i == no_fds); + yaz_log(man->log_level, "yaz_poll begin tv_sec=%d nofds=%d", tv_sec, + no_fds); + res = yaz_poll(fds, no_fds, tv_sec, 0); + yaz_log(man->log_level, "yaz_poll returned res=%d", res); + if (res < 0) + { if (errno == EINTR) continue; - else { - yaz_log(YLOG_ERRNO | YLOG_WARN, "select"); - return 0; + else + { + yaz_log(YLOG_ERRNO | YLOG_WARN, "poll"); + abort(); } } - if (man->sel_fd != -1) { - if (FD_ISSET(man->sel_fd, &in)) { + if (man->sel_fd != -1) + { + i = 0; + assert(fds[i].fd == man->sel_fd); + if (fds[i].output_mask) + { IOCHAN chan; yaz_log(man->log_level, "eventl: sel input on sel_fd=%d", man->sel_fd); - while ((chan = sel_thread_result(man->sel_thread))) { + while ((chan = sel_thread_result(man->sel_thread))) + { yaz_log(man->log_level, "eventl: got thread result chan=%p name=%s", chan, chan->name ? chan->name : ""); @@ -287,57 +306,80 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { } } } - if (man->log_level) { + if (man->log_level) + { int no = 0; - for (p = start; p; p = p->next) { + for (p = start; p; p = p->next) no++; - } yaz_log(man->log_level, "%d channels", no); } - for (p = start; p; p = p->next) { + for (p = start; p; p = p->next) + { time_t now = time(0); + i = p->poll_offset; - if (p->destroyed) { + 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) { + 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->max_idle && now - p->last_event > p->max_idle) { + 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)) { + if (fds[i].fd >= 0 && p->fd == fds[i].fd) + { + if (fds[i].output_mask & yaz_poll_read) + { p->last_event = now; p->this_event |= EVENT_INPUT; } - if (FD_ISSET(p->fd, &out)) { + if (fds[i].output_mask & yaz_poll_write) + { p->last_event = now; p->this_event |= EVENT_OUTPUT; } - if (FD_ISSET(p->fd, &except)) { + if (fds[i].output_mask & yaz_poll_except) + { p->last_event = now; p->this_event |= EVENT_EXCEPT; } } - run_fun(man, p); + /* only fire one Z39.50/SRU socket event.. except for timeout */ + if (p->this_event) + { + if (!(p->this_event & EVENT_TIMEOUT) && + !strcmp(p->name, "connection_socket")) + { + /* not a timeout and we have a Z39.50/SRU socket */ + if (connection_fired == 0) + run_fun(man, p); + connection_fired++; + } + else + run_fun(man, p); + } } + assert(inv_start == start); yaz_mutex_enter(man->iochan_mutex); - for (nextp = iochans; *nextp;) { + for (nextp = iochans; *nextp; ) + { IOCHAN p = *nextp; - if (p->destroyed && p->thread_users == 0) { - *nextp = iochan_destroy_real(nextp); - } else + if (p->destroyed && p->thread_users == 0) + *nextp = iochan_destroy_real(p); + else nextp = &p->next; } yaz_mutex_leave(man->iochan_mutex); @@ -345,8 +387,10 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { return 0; } -void iochan_man_events(iochan_man_t man) { - if (man->no_threads > 0 && !man->sel_thread) { +void iochan_man_events(iochan_man_t man) +{ + 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", @@ -355,17 +399,6 @@ 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