Adjustments to make YAZ compile as C++ code.

[yaz-moved-to-github.git] / src / eventl.c

diff --git a/src/eventl.c b/src/eventl.c
index a641326..f2963a1 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: eventl.c,v 1.13 2007-11-09 18:49:19 adam Exp $
+ * $Id: eventl.c,v 1.17 2007-11-30 11:44:47 adam Exp $
  */
 
 /**
@@ -10,7 +10,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 <assert.h>
@@ -64,22 +64,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;
+    struct yaz_poll_fd fds;
+    int res;
 
-    to.tv_sec = 0;
-    to.tv_usec = 0;
-
-    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))
@@ -87,7 +77,7 @@ 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 */
     {
@@ -106,21 +96,21 @@ int event_loop(IOCHAN *iochans)
         }
         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;
@@ -134,7 +124,7 @@ int event_loop(IOCHAN *iochans)
             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)