X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpoll.c;h=f3584d70a086eb9bfb2ad95d6178a19efcf82367;hp=f404c4f56dcefe3b45e0707ff8fba0b3050c74b0;hb=15aeea31b59ead99109571dcf67a5f3b78fd5585;hpb=3b792849c676d96918850e2f1e0af87a75278501

diff --git a/src/poll.c b/src/poll.c
index f404c4f..f3584d7 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -1,13 +1,14 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
- *
- * $Id: poll.c,v 1.2 2007-11-09 22:08:14 adam Exp $
  */
 /**
  * \file 
  * \brief Select, poll wrapper
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <string.h>
@@ -48,8 +49,7 @@
   cases, e.g. when running IRSpy on a large target database.  So you
   should ensure that YAZ uses ZOOM_yaz_poll_poll() when possible.
 */
-static int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds,
-                           int sec, int nsec)
+int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
     struct timeval tv;
     fd_set input, output, except;
@@ -66,6 +66,10 @@ static int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds,
         enum yaz_poll_mask mask = fds[i].input_mask;
         int fd = fds[i].fd;
 
+        /* Timeout events */
+        if (fd < 0)
+            continue;
+
         if (mask & yaz_poll_read)
             FD_SET(fd, &input);
         if (mask & yaz_poll_write)
@@ -77,35 +81,32 @@ static int yaz_poll_select(struct yaz_poll_fd *fds, int num_fds,
     }
     tv.tv_sec = sec;
     tv.tv_usec = nsec / 1000;
-
-    while ((r = select(max_fd+1, &input, &output, &except,
-                       (sec == -1 ? 0 : &tv))) < 0 && errno == EINTR)
-    {
-        ;
-    }
-    for (i = 0; i < num_fds; i++)
+    
+    r = select(max_fd+1, &input, &output, &except, (sec == -1 ? 0 : &tv));
+    if (r >= 0)
     {
-        enum yaz_poll_mask mask = 0;
-        int fd = fds[i].fd;
-        if (!r)
-            mask += yaz_poll_timeout;
-        else
+        for (i = 0; i < num_fds; i++)
         {
-            if (FD_ISSET(fd, &input))
-                mask += yaz_poll_read;
-            if (FD_ISSET(fd, &output))
-                mask += yaz_poll_write;
-            if (FD_ISSET(fd, &except))
-                mask += yaz_poll_except;
+            enum yaz_poll_mask mask = yaz_poll_none;
+            int fd = fds[i].fd;
+            if (!r)
+                yaz_poll_add(mask, yaz_poll_timeout);
+            else if (fd >= 0) {
+                if (FD_ISSET(fd, &input))
+                    yaz_poll_add(mask, yaz_poll_read);
+                if (FD_ISSET(fd, &output))
+                    yaz_poll_add(mask, yaz_poll_write);
+                if (FD_ISSET(fd, &except))
+                    yaz_poll_add(mask, yaz_poll_except);
+            }
+            fds[i].output_mask = mask;
         }
-        fds[i].output_mask = mask;
     }
     return r;
 }
 
 #if HAVE_SYS_POLL_H
-static int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds,
-                         int sec, int nsec)
+int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
     int r;
     struct pollfd *pollfds = (struct pollfd *) 
@@ -129,27 +130,24 @@ static int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds,
         pollfds[i].events = poll_events;
         pollfds[i].revents = 0;
     }
-    while ((r = poll(pollfds, num_fds,
-                     (sec == -1 ? -1 : sec*1000 + nsec/1000000))) < 0
-           && errno == EINTR)
-    {
-        ;
-    }
+    r = poll(pollfds, num_fds, sec == -1 ? -1 : sec*1000 + nsec/1000000);
     if (r >= 0)
     {
         for (i = 0; i < num_fds; i++)
         {
-            enum yaz_poll_mask mask = 0;
+            enum yaz_poll_mask mask = yaz_poll_none;
             if (!r)
-                mask += yaz_poll_timeout;
+                yaz_poll_add(mask, yaz_poll_timeout);
             else
             {
                 if (pollfds[i].revents & POLLIN)
-                    mask += yaz_poll_read;
+                    yaz_poll_add(mask, yaz_poll_read);
                 if (pollfds[i].revents & POLLOUT)
-                    mask += yaz_poll_write;
-                if (pollfds[i].revents & POLLERR)
-                    mask += yaz_poll_except;
+                    yaz_poll_add(mask, yaz_poll_write);
+                if (pollfds[i].revents & ~(POLLIN | POLLOUT))
+                {
+                    yaz_poll_add(mask, yaz_poll_except);
+                }
             }
             fds[i].output_mask = mask;
         }
@@ -161,7 +159,7 @@ static int yaz_poll_poll(struct yaz_poll_fd *fds, int num_fds,
 
 int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 {
-#if YAZ_HAVE_SYS_POLL_H
+#if HAVE_SYS_POLL_H
     return yaz_poll_poll(fds, num_fds, sec, nsec);
 #else
     return yaz_poll_select(fds, num_fds, sec, nsec);
@@ -171,6 +169,7 @@ int yaz_poll(struct yaz_poll_fd *fds, int num_fds, int sec, int nsec)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab