--- libev/ev_poll.c	2008/04/09 22:33:55	1.22
+++ libev/ev_poll.c	2009/07/19 04:11:27	1.31
@@ -1,7 +1,7 @@
 /*
  * libev poll fd activity backend
  *
- * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -42,6 +42,8 @@
 void inline_size
 pollidx_init (int *base, int count)
 {
+  /* consider using memset (.., -1, ...), which is pratically guarenteed
+   * to work on all systems implementing poll */
   while (count--)
     *base++ = -1;
 }
@@ -86,8 +88,12 @@
 static void
 poll_poll (EV_P_ ev_tstamp timeout)
 {
-  int i;
-  int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
+  struct pollfd *p;
+  int res;
+  
+  EV_RELEASE_CB;
+  res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));
+  EV_ACQUIRE_CB;
 
   if (expect_false (res < 0))
     {
@@ -96,19 +102,24 @@
       else if (errno == ENOMEM && !syserr_cb)
         fd_enomem (EV_A);
       else if (errno != EINTR)
-        syserr ("(libev) poll");
+        ev_syserr ("(libev) poll");
     }
-  else if (res > 0)
-    for (i = 0; i < pollcnt; ++i)
-      if (expect_false (polls [i].revents & POLLNVAL))
-        fd_kill (EV_A_ polls [i].fd);
-      else
-        fd_event (
-          EV_A_
-          polls [i].fd,
-          (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
-          | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
-        );
+  else
+    for (p = polls; res; ++p)
+      if (expect_false (p->revents)) /* this expect is debatable */
+        {
+          --res;
+
+          if (expect_false (p->revents & POLLNVAL))
+            fd_kill (EV_A_ p->fd);
+          else
+            fd_event (
+              EV_A_
+              p->fd,
+              (p->revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
+              | (p->revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
+            );
+        }
 }
 
 int inline_size