X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Feventl.c;h=5e219ca6fab1164e386a70fdbbfd2459254d45d9;hp=74509c8d3fdfcfeabe86a635f3033d5147fa6d76;hb=c2d4d247b3fe28f7c191fbc3644c8e011e1a4fea;hpb=413ed128af037bdb681d673fc6ae68163ad218a4 diff --git a/src/eventl.c b/src/eventl.c index 74509c8..5e219ca 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. - * - * $Id: eventl.c,v 1.12 2007-11-09 18:47:50 adam Exp $ */ /** @@ -10,7 +8,7 @@ * \brief Implements event loop handling for GFS. * * This source implements the main event loop for the Generic Frontend - * Server. It uses select(2). + * Server. */ #include @@ -26,39 +24,16 @@ #include #endif -#define NPOLL 1 - -#if NPOLL #include -#else - -#ifdef WIN32 -#include -#endif -#if HAVE_UNISTD_H -#include -#endif -#if HAVE_SYS_SELECT_H -#include -#endif -#endif #include #include #include +#include #include "eventl.h" #include "session.h" #include -#if YAZ_GNU_THREADS -#include -#define YAZ_EV_SELECT pth_select -#endif - -#ifndef YAZ_EV_SELECT -#define YAZ_EV_SELECT select -#endif - static int log_level=0; static int log_level_initialized=0; @@ -88,22 +63,12 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, int chan_id) int iochan_is_alive(IOCHAN chan) { - static struct timeval to; - fd_set in, out, except; - int res, max; - - to.tv_sec = 0; - to.tv_usec = 0; + struct yaz_poll_fd fds; + int res; - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); - - FD_SET(chan->fd, &in); - - max = chan->fd + 1; - - res = YAZ_EV_SELECT(max + 1, &in, 0, 0, &to); + fds.fd = chan->fd; + fds.input_mask = yaz_poll_read; + res = yaz_poll(&fds, 1, 0, 0); if (res == 0) return 1; if (!ir_read(chan, EVENT_INPUT)) @@ -111,21 +76,15 @@ int iochan_is_alive(IOCHAN chan) return 1; } -int event_loop(IOCHAN *iochans) +int iochan_event_loop(IOCHAN *iochans) { do /* loop as long as there are active associations to process */ { IOCHAN p, nextp; -#if NPOLL int i; int tv_sec = 3600; int no_fds = 0; struct yaz_poll_fd *fds = 0; -#else - fd_set in, out, except; - static struct timeval to; - int max; -#endif int res; time_t now = time(0); @@ -134,24 +93,23 @@ int event_loop(IOCHAN *iochans) for (p = *iochans; p; p = p->next) p->force_event = EVENT_TIMEOUT; } -#if NPOLL for (p = *iochans; p; p = p->next) no_fds++; - fds = xmalloc(no_fds * sizeof(*fds)); + fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds)); for (i = 0, p = *iochans; p; p = p->next, i++) { time_t w, ftime; - enum yaz_poll_mask input_mask = 0; + enum yaz_poll_mask input_mask = yaz_poll_none; yaz_log(log_level, "fd=%d flags=%d force_event=%d", p->fd, p->flags, p->force_event); if (p->force_event) tv_sec = 0; /* polling select */ if (p->flags & EVENT_INPUT) - input_mask += yaz_poll_read; + yaz_poll_add(input_mask, yaz_poll_read); if (p->flags & EVENT_OUTPUT) - input_mask += yaz_poll_write; + yaz_poll_add(input_mask, yaz_poll_write); if (p->flags & EVENT_EXCEPT) - input_mask += yaz_poll_except; + yaz_poll_add(input_mask, yaz_poll_except); if (p->max_idle && p->last_event) { ftime = p->last_event + p->max_idle; @@ -159,50 +117,14 @@ int event_loop(IOCHAN *iochans) w = p->max_idle; else w = ftime - now; + /* tv_sec will be minimum wait.. */ if (w < tv_sec) - tv_sec = w; + tv_sec = (int) w; /* can hold it because w < tv_sec */ } fds[i].fd = p->fd; fds[i].input_mask = input_mask; } - res = yaz_poll(fds, no_fds, tv_sec); -#else - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); - to.tv_sec = 3600; - to.tv_usec = 0; - max = 0; - for (p = *iochans; p; p = p->next) - { - time_t w, ftime; - yaz_log(log_level, "fd=%d flags=%d force_event=%d", - p->fd, p->flags, p->force_event); - if (p->force_event) - to.tv_sec = 0; /* polling select */ - if (p->flags & EVENT_INPUT) - FD_SET(p->fd, &in); - if (p->flags & EVENT_OUTPUT) - FD_SET(p->fd, &out); - if (p->flags & EVENT_EXCEPT) - FD_SET(p->fd, &except); - if (p->fd > max) - max = p->fd; - if (p->max_idle && p->last_event) - { - ftime = p->last_event + p->max_idle; - if (ftime < now) - w = p->max_idle; - else - w = ftime - now; - if (w < to.tv_sec) - to.tv_sec = w; - } - } - yaz_log(log_level, "select start %ld", (long) to.tv_sec); - res = YAZ_EV_SELECT(max + 1, &in, &out, &except, &to); - yaz_log(log_level, "select end"); -#endif + res = yaz_poll(fds, no_fds, tv_sec, 0); if (res < 0) { if (yaz_errno() == EINTR) @@ -217,19 +139,12 @@ int event_loop(IOCHAN *iochans) } else { - /* Destroy the first member in the chain, and try again */ - association *assoc = (association *)iochan_getdata(*iochans); - COMSTACK conn = assoc->client_link; - - cs_close(conn); - destroy_association(assoc); - iochan_destroy(*iochans); - yaz_log(log_level, "error select, destroying iochan %p", - *iochans); + yaz_log(YLOG_WARN|YLOG_ERRNO, "yaz_poll"); + xfree(fds); + continue; } } now = time(0); -#if NPOLL for (i = 0, p = *iochans; p; p = p->next, i++) { int force_event = p->force_event; @@ -262,38 +177,6 @@ int event_loop(IOCHAN *iochans) } } xfree(fds); -#else - for (p = *iochans; p; p = p->next) - { - int force_event = p->force_event; - - p->force_event = 0; - if (!p->destroyed && (FD_ISSET(p->fd, &in) || - force_event == EVENT_INPUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_INPUT); - } - if (!p->destroyed && (FD_ISSET(p->fd, &out) || - force_event == EVENT_OUTPUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_OUTPUT); - } - if (!p->destroyed && (FD_ISSET(p->fd, &except) || - force_event == EVENT_EXCEPT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_EXCEPT); - } - if (!p->destroyed && ((p->max_idle && now - p->last_event >= - p->max_idle) || force_event == EVENT_TIMEOUT)) - { - p->last_event = now; - (*p->fun)(p, EVENT_TIMEOUT); - } - } -#endif for (p = *iochans; p; p = nextp) { nextp = p->next; @@ -328,6 +211,7 @@ int event_loop(IOCHAN *iochans) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab