*** empty log message ***

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index 07b1f5caf7a491c03356fbf9490fac5be485f505..de516d76de05c0440a270f88c842d18df84fa390 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -42,14 +42,18 @@ static void
 poll_modify (EV_P_ int fd, int oev, int nev)
 {
   int idx;
-  array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init);
+
+  if (oev == nev)
+    return;
+
+  array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);
 
   idx = pollidxs [fd];
 
   if (idx < 0) /* need to allocate a new pollfd */
     {
       idx = pollcnt++;
-      array_needsize (polls, pollmax, pollcnt, );
+      array_needsize (struct pollfd, polls, pollmax, pollcnt, );
       polls [idx].fd = fd;
     }
 
@@ -71,27 +75,28 @@ poll_modify (EV_P_ int fd, int oev, int nev)
 static void
 poll_poll (EV_P_ ev_tstamp timeout)
 {
+  int i;
   int res = poll (polls, pollcnt, ceil (timeout * 1000.));
 
-  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 (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 ("(libev) poll");
+
+      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
@@ -101,5 +106,16 @@ poll_init (EV_P_ int flags)
   method_modify = poll_modify;
   method_poll   = poll_poll;
 
+  pollidxs = 0; pollidxmax = 0;
+  polls    = 0; pollmax    = 0; pollcnt = 0;
+
   return EVMETHOD_POLL;
 }
+
+static void
+poll_destroy (EV_P)
+{
+  ev_free (pollidxs);
+  ev_free (polls);
+}
+