-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
* See the file LICENSE for details.
- *
- * $Id: eventl.c,v 1.5 2005-01-15 19:47:13 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 <config.h>
+#endif
-#include <stdio.h>
#include <assert.h>
-#ifdef WIN32
-#include <winsock.h>
-#else
-#include <unistd.h>
-#endif
-#include <stdlib.h>
#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <yaz/yconfig.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#include <yaz/poll.h>
+
#include <yaz/log.h>
#include <yaz/comstack.h>
#include <yaz/xmalloc.h>
+#include <yaz/errno.h>
#include "eventl.h"
#include "session.h"
#include <yaz/statserv.h>
-#if YAZ_GNU_THREADS
-#include <pth.h>
-#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;
-IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, int chan_id)
{
IOCHAN new_iochan;
}
if (!(new_iochan = (IOCHAN)xmalloc(sizeof(*new_iochan))))
- return 0;
+ return 0;
new_iochan->destroyed = 0;
new_iochan->fd = fd;
new_iochan->flags = flags;
new_iochan->force_event = 0;
new_iochan->last_event = new_iochan->max_idle = 0;
new_iochan->next = NULL;
+ new_iochan->chan_id = chan_id;
return new_iochan;
}
-int event_loop(IOCHAN *iochans)
+
+int iochan_is_alive(IOCHAN chan)
+{
+ struct yaz_poll_fd fds;
+ int res;
+
+ 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))
+ return 0;
+ return 1;
+}
+
+int iochan_event_loop(IOCHAN *iochans, int *watch_sig)
{
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;
+ IOCHAN p, nextp;
+ 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)
+ no_fds++;
+ fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
+ for (i = 0, p = *iochans; p; p = p->next, i++)
{
- 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)
- {
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 */
- 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->force_event)
+ tv_sec = 0; /* polling select */
+ if (p->flags & EVENT_INPUT)
+ yaz_poll_add(input_mask, yaz_poll_read);
+ if (p->flags & EVENT_OUTPUT)
+ yaz_poll_add(input_mask, yaz_poll_write);
+ if (p->flags & EVENT_EXCEPT)
+ yaz_poll_add(input_mask, yaz_poll_except);
if (p->max_idle && p->last_event)
{
ftime = p->last_event + p->max_idle;
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 */
}
- }
- 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");
- if (res < 0)
- {
- if (yaz_errno() == EINTR)
+ fds[i].fd = p->fd;
+ fds[i].input_mask = input_mask;
+ }
+ 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);
+ if (watch_sig && *watch_sig)
+ break;
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)
- {
- 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);
- }
- }
- for (p = *iochans; p; p = nextp)
- {
- nextp = p->next;
-
- if (p->destroyed)
- {
- IOCHAN tmp = p, pr;
+ 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 && ((output_mask & yaz_poll_read) ||
+ force_event == EVENT_INPUT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_INPUT);
+ }
+ if (!p->destroyed && ((output_mask & yaz_poll_write) ||
+ force_event == EVENT_OUTPUT))
+ {
+ p->last_event = now;
+ (*p->fun)(p, EVENT_OUTPUT);
+ }
+ if (!p->destroyed && ((output_mask & yaz_poll_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);
+ }
+ }
+ xfree(fds);
+ for (p = *iochans; p; p = nextp)
+ {
+ nextp = p->next;
+
+ if (p->destroyed)
+ {
+ IOCHAN tmp = p, pr;
/* We need to inform the threadlist that this channel has been destroyed */
statserv_remove(p);
- /* Now reset the pointers */
+ /* 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);
- }
- }
+ *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);
+ }
+ }
}
while (*iochans);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff