-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: eventl.c,v 1.14 2007-11-09 19:00:42 adam Exp $
*/
/**
* \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 <assert.h>
fds.fd = chan->fd;
fds.input_mask = yaz_poll_read;
- res = yaz_poll(&fds, 1, 0);
+ res = yaz_poll(&fds, 1, 0, 0);
if (res == 0)
return 1;
if (!ir_read(chan, EVENT_INPUT))
return 1;
}
-int event_loop(IOCHAN *iochans)
+int iochan_event_loop(IOCHAN *iochans)
{
do /* loop as long as there are active associations to process */
{
}
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;
fds[i].fd = p->fd;
fds[i].input_mask = input_mask;
}
- res = yaz_poll(fds, no_fds, tv_sec);
+ res = yaz_poll(fds, no_fds, tv_sec, 0);
if (res < 0)
{
if (yaz_errno() == EINTR)