X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/408214e3dfe1ba40783a70c02d98b92738bdb979..6fb30a67f78730c733f64429f327e360ea2acaf3:/ev_port.c?ds=inline

diff --git a/ev_port.c b/ev_port.c
index e6555bb..e457485 100644
--- a/ev_port.c
+++ b/ev_port.c
@@ -36,22 +36,14 @@
 #include <string.h>
 #include <errno.h>
 
-static void
-port_modify (EV_P_ int fd, int oev, int nev)
+void inline_speed
+port_associate_and_check (EV_P_ int fd, int ev)
 {
-  /* we need to reassociate no matter what, as closes are
-   * once more silently being discarded.
-   */
-  if (!nev)
-    {
-      if (oev)
-        port_dissociate (backend_fd, PORT_SOURCE_FD, fd);
-    }
-  else if (0 >
+  if (0 >
       port_associate (
          backend_fd, PORT_SOURCE_FD, fd,
-         (nev & EV_READ ? POLLIN : 0)
-         | (nev & EV_WRITE ? POLLOUT : 0),
+         (ev & EV_READ ? POLLIN : 0)
+         | (ev & EV_WRITE ? POLLOUT : 0),
          0
       )
   )
@@ -60,7 +52,22 @@ port_modify (EV_P_ int fd, int oev, int nev)
         fd_kill (EV_A_ fd);
       else
         syserr ("(libev) port_associate");
-    } 
+    }
+}
+
+static void
+port_modify (EV_P_ int fd, int oev, int nev)
+{
+  /* we need to reassociate no matter what, as closes are
+   * once more silently being discarded.
+   */
+  if (!nev)
+    {
+      if (oev)
+        port_dissociate (backend_fd, PORT_SOURCE_FD, fd);
+    }
+  else
+    port_associate_and_check (EV_A_ fd, nev);
 }
 
 static void
@@ -95,20 +102,19 @@ port_poll (EV_P_ ev_tstamp timeout)
             | (port_events [i].portev_events & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
           );
 
-          anfds [fd].events = 0; /* event received == disassociated */
-          fd_change (EV_A_ fd); /* need to reify later */
+          port_associate_and_check (EV_A_ fd, anfds [fd].events);
         }
     }
 
   if (expect_false (nget == port_eventmax))
     {
       ev_free (port_events);
-      port_eventmax = array_roundsize (port_event_t, port_eventmax << 1);
+      port_eventmax = array_nextsize (sizeof (port_event_t), port_eventmax, port_eventmax + 1);
       port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax);
     }
 }
 
-static int
+int inline_size
 port_init (EV_P_ int flags)
 {
   /* Initalize the kernel queue */
@@ -127,15 +133,13 @@ port_init (EV_P_ int flags)
   return EVBACKEND_PORT;
 }
 
-static void
+void inline_size
 port_destroy (EV_P)
 {
-  close (backend_fd);
-
   ev_free (port_events);
 }
 
-static void
+void inline_size
 port_fork (EV_P)
 {
   close (backend_fd);