poll: do not return 0 on timeout=-1

* lib/poll.c: Loop with yield if no events occured

diff --git a/ChangeLog b/ChangeLog
index e1ed45284c2a75e1f5ed2c1c4bd3da4b1d6d6934..a0bfe36408eae8471f439bd9438d89717c1b4556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-06  Erik Faye-Lund  <kusmabite@gmail.com>
+
+       poll: do not return 0 on timeout=-1
+       * lib/poll.c: Loop with yield if no events occured
+
 2011-07-06  Eric Blake  <eblake@redhat.com>
 
        pthread_sigmask: always replace when not using pthread

diff --git a/lib/poll.c b/lib/poll.c
index 8ce68c01548c76749f519dbacf96c1a433cc24aa..e06456581b5d8163e320b56e55195182e5ad9bc7 100644 (file)
--- a/lib/poll.c
+++ b/lib/poll.c
@@ -452,6 +452,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
   if (!hEvent)
     hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
 
+restart:
   handle_array[0] = hEvent;
   nhandles = 1;
   FD_ZERO (&rfds);
@@ -592,6 +593,12 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
         rc++;
     }
 
+  if (!rc && timeout == INFTIM)
+    {
+      SwitchToThread();
+      goto restart;
+    }
+
   return rc;
 #endif
 }