X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Feventl.c;h=797f65b1304cde7dabd63ebb0d76edd77851c513;hb=04b35087d7af404d7498622e495e09a93d50b406;hp=faba34dd433ac8677b20943140e8b685554cc257;hpb=2146ffa7919deebc945e8b157f47658f16396b2f;p=pazpar2-moved-to-github.git diff --git a/src/eventl.c b/src/eventl.c index faba34d..797f65b 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 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-2010 Index Data ApS + * Copyright (C) Index Data ApS * See LICENSE file for details. */ @@ -58,6 +58,45 @@ #include "eventl.h" #include "sel_thread.h" +#if 1 +static YAZ_MUTEX g_mutex = 0; +static int no_iochans = 0; +static int no_iochans_total = 0; + +static int iochan_use(int delta) +{ + int iochans; + if (!g_mutex) + yaz_mutex_create(&g_mutex); + yaz_mutex_enter(g_mutex); + no_iochans += delta; + if (delta > 0) + 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); + return iochans; +} + +int iochans_count(void) { + return iochan_use(0); +} + +int iochans_count_total(void) { + int total = 0; + if (!g_mutex) + return 0; + yaz_mutex_enter(g_mutex); + total = no_iochans_total; + yaz_mutex_leave(g_mutex); + return total; +} +#else +#define iochan_use(x) +#define iochans_count(x) 0 +#define iochans_count_total(x) 0 +#endif + struct iochan_man_s { IOCHAN channel_list; sel_thread_t sel_thread; @@ -79,6 +118,16 @@ iochan_man_t iochan_man_create(int no_threads) { return man; } +IOCHAN iochan_destroy_real(IOCHAN chan) +{ + IOCHAN next = chan->next; + if (chan->name) + xfree(chan->name); + xfree(chan); + iochan_use(-1); + return next; +} + void iochan_man_destroy(iochan_man_t *mp) { if (*mp) { IOCHAN c; @@ -90,10 +139,7 @@ void iochan_man_destroy(iochan_man_t *mp) { (*mp)->channel_list = NULL; yaz_mutex_leave((*mp)->iochan_mutex); while (c) { - IOCHAN c_next = c->next; - xfree(c->name); - xfree(c); - c = c_next; + c = iochan_destroy_real(c); } yaz_mutex_destroy(&(*mp)->iochan_mutex); xfree(*mp); @@ -116,6 +162,7 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) { if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan)))) return 0; + iochan_use(1); new_iochan->destroyed = 0; new_iochan->fd = fd; new_iochan->flags = flags; @@ -148,16 +195,14 @@ static void work_handler(void *work_data) { } 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); - } + 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) { @@ -166,17 +211,12 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { IOCHAN p, *nextp; IOCHAN start; IOCHAN inv_start; - fd_set in, out, except; - int res, max; + int res; 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 */ + + struct yaz_poll_fd *fds; + int i, no_fds = 0; + int connection_fired = 0; to.tv_sec = 300; to.tv_usec = 0; @@ -186,48 +226,57 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { 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) + if (p->fd >= 0) + no_fds++; + if (man->sel_fd != -1) no_fds++; + fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); + i = 0; + if (man->sel_fd != -1) + { + fds[i].fd = man->sel_fd; + fds[i].input_mask = 0; + if (p->flags & EVENT_INPUT) + fds[i].input_mask |= yaz_poll_read; + i++; } -// fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); - - max = 0; - for (p = start; p; p = p->next) { + for (p = start; p; p = p->next) + { if (p->thread_users > 0) continue; if (p->max_idle && p->max_idle < to.tv_sec) to.tv_sec = p->max_idle; if (p->fd < 0) continue; + fds[i].fd = p->fd; + fds[i].input_mask = 0; 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 nofds=%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; + i++; } - 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) { + yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds); + res = yaz_poll(fds, no_fds, to.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"); + yaz_log(YLOG_ERRNO | YLOG_WARN, "poll"); return 0; } } - if (man->sel_fd != -1) { - if (FD_ISSET(man->sel_fd, &in)) { + i = 0; + if (man->sel_fd != -1) + { + 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", @@ -239,63 +288,90 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { chan->thread_users--; } } + i++; } - 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); - if (p->destroyed) { + if (p->destroyed) + { yaz_log(man->log_level, "eventl: skip destroyed chan=%p name=%s", p, p->name ? p->name : ""); + if (p->fd >= 0) + i++; 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); + if (p->fd >= 0) + i++; 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 (p->fd >= 0) + { + assert(fds[i].fd == p->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; } + i++; + } + /* 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); } - run_fun(man, p); } + assert(inv_start == start); yaz_mutex_enter(man->iochan_mutex); for (nextp = iochans; *nextp;) { IOCHAN p = *nextp; if (p->destroyed && p->thread_users == 0) { - *nextp = p->next; - xfree(p->name); - xfree(p); + *nextp = iochan_destroy_real(p); } else nextp = &p->next; } yaz_mutex_leave(man->iochan_mutex); + xfree(fds); } while (*iochans); return 0; }