*** empty log message ***

[software/libev.git] / ev_port.c

diff --git a/ev_port.c b/ev_port.c
index db3bae51f916b05e69251221eae0793842ad2a1f..e457485bc9fb8863810cfdb20dd80dac22b80334 100644 (file)
--- a/ev_port.c
+++ b/ev_port.c
@@ -36,22 +36,14 @@
 #include <string.h>
 #include <errno.h>
 
 #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,
       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
       )
   )
          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");
         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
 }
 
 static void


@@ -95,15 +102,14 @@ port_poll (EV_P_ ev_tstamp timeout)
             | (port_events [i].portev_events & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
           );
 
             | (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);
         }
     }
 
   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);
     }
 }
       port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax);
     }
 }