avoid backend_modify call unless ev_io_set was used

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index 5ad7261b79bc32b1f96917f19aa42a97dff30b74..d609833e291e21f40d91846ddc9e6b7e0f8269b2 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -1,5 +1,5 @@
 /*
 /*

- * libev epoll fd activity backend
+ * libev poll fd activity backend

  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.


@@ -31,7 +31,7 @@
 
 #include <poll.h>
 
 
 #include <poll.h>
 

-static void
+void inline_size

 pollidx_init (int *base, int count)
 {
   while (count--)
 pollidx_init (int *base, int count)
 {
   while (count--)


@@ -53,7 +53,7 @@ poll_modify (EV_P_ int fd, int oev, int nev)
   if (idx < 0) /* need to allocate a new pollfd */
     {
       pollidxs [fd] = idx = pollcnt++;
   if (idx < 0) /* need to allocate a new pollfd */
     {
       pollidxs [fd] = idx = pollcnt++;

-      array_needsize (struct pollfd, polls, pollmax, pollcnt, );
+      array_needsize (struct pollfd, polls, pollmax, pollcnt, EMPTY2);

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


@@ -67,7 +67,7 @@ poll_modify (EV_P_ int fd, int oev, int nev)
     {
       pollidxs [fd] = -1;
 
     {
       pollidxs [fd] = -1;
 

-      if (idx < --pollcnt)
+      if (expect_true (idx < --pollcnt))

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


@@ -79,9 +79,9 @@ 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 (expect_false (res < 0))

     {
       if (errno == EBADF)
         fd_ebadf (EV_A);
     {
       if (errno == EBADF)
         fd_ebadf (EV_A);


@@ -94,28 +94,31 @@ 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 (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)
+      );

 }
 
 }
 

-static int
+int inline_size

 poll_init (EV_P_ int flags)
 {
 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  = 0.; /* posix says this is zero */
+  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
+void inline_size

 poll_destroy (EV_P)
 {
   ev_free (pollidxs);
 poll_destroy (EV_P)
 {
   ev_free (pollidxs);