more thorough renaming, might even work now

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index de516d76de05c0440a270f88c842d18df84fa390..293958f9c803447466cff3352c7be5d3882eaf87 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -52,20 +52,23 @@ poll_modify (EV_P_ int fd, int oev, int nev)
 
   if (idx < 0) /* need to allocate a new pollfd */
     {
 
   if (idx < 0) /* need to allocate a new pollfd */
     {

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

       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)
     {


@@ -91,25 +94,28 @@ poll_poll (EV_P_ ev_tstamp timeout)
     }
 
   for (i = 0; i < pollcnt; ++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)
-    );
+    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
 poll_init (EV_P_ int flags)
 {
 }
 
 static int
 poll_init (EV_P_ int flags)
 {

-  method_fudge  = 1e-3; /* needed to compensate for select returning early, very conservative */
-  method_modify = poll_modify;
-  method_poll   = poll_poll;
+  backend_fudge  = 1e-3; /* needed to compensate for select returning early, very conservative */
+  backend_modify = poll_modify;
+  backend_poll   = poll_poll;

 
   pollidxs = 0; pollidxmax = 0;
   polls    = 0; pollmax    = 0; pollcnt = 0;
 
 
   pollidxs = 0; pollidxmax = 0;
   polls    = 0; pollmax    = 0; pollcnt = 0;
 

-  return EVMETHOD_POLL;
+  return EVBACKEND_POLL;

 }
 
 static void
 }
 
 static void