X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Feventl.c;h=3075d5973ba9f6c43eb9a542437d36871227ceda;hp=70230030783bdb53130dedef0960425b23de0e6e;hb=11af92513c72d3eb1e618e658b9418a42f4a630f;hpb=8d691989077a0addcbd840d769dce6700f3d9622 diff --git a/src/eventl.c b/src/eventl.c index 7023003..3075d59 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,17 +1,17 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. - * - * $Id: eventl.c,v 1.11 2007-01-03 08:42:15 adam Exp $ */ - /** * \file eventl.c * \brief Implements event loop handling for GFS. * * This source implements the main event loop for the Generic Frontend - * Server. It uses select(2). + * Server. */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -25,33 +25,17 @@ #if HAVE_SYS_TIME_H #include #endif -#ifdef WIN32 -#include -#endif -#if HAVE_UNISTD_H -#include -#endif -#if HAVE_SYS_SELECT_H -#include -#endif -#include +#include + #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; @@ -78,24 +62,15 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, int chan_id) return new_iochan; } + 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; - - FD_ZERO(&in); - FD_ZERO(&out); - FD_ZERO(&except); + struct yaz_poll_fd fds; + int res; - 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)) @@ -103,42 +78,35 @@ 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; - fd_set in, out, except; - int res, max; - static struct timeval to; + int i; + int tv_sec = 3600; + int no_fds = 0; + struct yaz_poll_fd *fds = 0; + int res; time_t now = time(0); - if (statserv_must_terminate()) - { - for (p = *iochans; p; p = p->next) - p->force_event = EVENT_TIMEOUT; - } - 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) + no_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 = 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) - to.tv_sec = 0; /* polling select */ + tv_sec = 0; /* polling select */ if (p->flags & EVENT_INPUT) - FD_SET(p->fd, &in); + yaz_poll_add(input_mask, yaz_poll_read); if (p->flags & EVENT_OUTPUT) - FD_SET(p->fd, &out); + yaz_poll_add(input_mask, yaz_poll_write); if (p->flags & EVENT_EXCEPT) - FD_SET(p->fd, &except); - if (p->fd > max) - max = p->fd; + yaz_poll_add(input_mask, yaz_poll_except); if (p->max_idle && p->last_event) { ftime = p->last_event + p->max_idle; @@ -146,56 +114,48 @@ int event_loop(IOCHAN *iochans) w = p->max_idle; else w = ftime - now; - if (w < to.tv_sec) - to.tv_sec = w; + /* tv_sec will be minimum wait.. */ + if (w < tv_sec) + tv_sec = (int) w; /* can hold it because w < tv_sec */ } + fds[i].fd = p->fd; + fds[i].input_mask = input_mask; } - 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"); + res = yaz_poll(fds, no_fds, tv_sec, 0); if (res < 0) { if (yaz_errno() == EINTR) { - if (statserv_must_terminate()) - { - for (p = *iochans; p; p = p->next) - p->force_event = EVENT_TIMEOUT; - } + xfree(fds); continue; } 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); - for (p = *iochans; p; p = p->next) + for (i = 0, p = *iochans; p; p = p->next, i++) { int force_event = p->force_event; + enum yaz_poll_mask output_mask = fds[i].output_mask; p->force_event = 0; - if (!p->destroyed && (FD_ISSET(p->fd, &in) || - force_event == EVENT_INPUT)) + if (!p->destroyed && ((output_mask & yaz_poll_read) || + 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)) + if (!p->destroyed && ((output_mask & yaz_poll_write) || + force_event == EVENT_OUTPUT)) { p->last_event = now; (*p->fun)(p, EVENT_OUTPUT); } - if (!p->destroyed && (FD_ISSET(p->fd, &except) || + if (!p->destroyed && ((output_mask & yaz_poll_except) || force_event == EVENT_EXCEPT)) { p->last_event = now; @@ -208,6 +168,7 @@ int event_loop(IOCHAN *iochans) (*p->fun)(p, EVENT_TIMEOUT); } } + xfree(fds); for (p = *iochans; p; p = nextp) { nextp = p->next; @@ -242,6 +203,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