*** empty log message ***

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index e809dddeb3b3504cc447ce6baad066cac2a2bb0f..481202128768e30bc394f59a50b4eb26a4913de4 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -46,26 +46,29 @@ poll_modify (EV_P_ int fd, int oev, int nev)
   if (oev == nev)
     return;
 
   if (oev == nev)
     return;
 

-  array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init);
+  array_needsize (int, pollidxs, pollidxmax, fd + 1, pollidx_init);

 
   idx = pollidxs [fd];
 
   if (idx < 0) /* need to allocate a new pollfd */
     {
 
   idx = pollidxs [fd];
 
   if (idx < 0) /* need to allocate a new pollfd */
     {

-      idx = pollcnt++;
-      array_needsize (polls, pollmax, pollcnt, );
+      pollidxs [fd] = idx = pollcnt++;
+      array_needsize (struct pollfd, polls, pollmax, pollcnt, );

       polls [idx].fd = fd;
     }
 
       polls [idx].fd = fd;
     }
 

+  assert (polls [idx].fd == fd);
+

   if (nev)
     polls [idx].events =
         (nev & EV_READ ? POLLIN : 0)
         | (nev & EV_WRITE ? POLLOUT : 0);
   else /* remove pollfd */
     {
   if (nev)
     polls [idx].events =
         (nev & EV_READ ? POLLIN : 0)
         | (nev & EV_WRITE ? POLLOUT : 0);
   else /* remove pollfd */
     {

-      if (idx < pollcnt--)
+      pollidxs [fd] = -1;
+
+      if (idx < --pollcnt)

         {
         {

-          pollidxs [fd] = -1;

           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;
         }
           polls [idx] = polls [pollcnt];
           pollidxs [polls [idx].fd] = idx;
         }


@@ -76,7 +79,7 @@ static void
 poll_poll (EV_P_ ev_tstamp timeout)
 {
   int i;
 poll_poll (EV_P_ ev_tstamp timeout)
 {
   int i;

-  int res = poll (polls, pollcnt, ceil (timeout * 1000.));
+  int res = poll (polls, pollcnt, (int)ceil (timeout * 1000.));

 
   if (res < 0)
     {
 
   if (res < 0)
     {


@@ -85,18 +88,21 @@ poll_poll (EV_P_ ev_tstamp timeout)
       else if (errno == ENOMEM && !syserr_cb)
         fd_enomem (EV_A);
       else if (errno != EINTR)
       else if (errno == ENOMEM && !syserr_cb)
         fd_enomem (EV_A);
       else if (errno != EINTR)

-        syserr ();
+        syserr ("(libev) poll");

 
       return;
     }
 
   for (i = 0; i < pollcnt; ++i)
 
       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)
-    );
+    if (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)
+      );

 }
 
 static int
 }
 
 static int


@@ -118,3 +124,4 @@ poll_destroy (EV_P)
   ev_free (pollidxs);
   ev_free (polls);
 }
   ev_free (pollidxs);
   ev_free (polls);
 }

+