[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_poll.c (file contents):
Revision 1.5 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.7 by root, Tue Nov 6 00:10:04 2007 UTC

 static void
 poll_modify (EV_P_ int fd, int oev, int nev)
 {
   int idx;
+  if (oev == nev)
+    return;
   array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init);
   idx = pollidxs [fd];
   if (idx < 0) /* need to allocate a new pollfd */
 }
 static void
 poll_poll (EV_P_ ev_tstamp timeout)
 {
+  int i;
   int res = poll (polls, pollcnt, ceil (timeout * 1000.));
-  if (res > 0)
+  if (res < 0)
-    {
-      int i;
-      for (i = 0; i < pollcnt; ++i)
-        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 if (res < 0)
     {
       if (errno == EBADF)
         fd_ebadf (EV_A);
-      else if (errno == ENOMEM)
+      else if (errno == ENOMEM && !syserr_cb)
         fd_enomem (EV_A);
+      else if (errno != EINTR)
+        syserr ();
+      return;
     }
+  for (i = 0; i < pollcnt; ++i)
+    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)
+    );
 }
 static int
 poll_init (EV_P_ int flags)
 {
 }
 static void
 poll_destroy (EV_P)
 {
-  free (pollidxs);
+  ev_free (pollidxs);
-  free (polls);
+  ev_free (polls);
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines