Use #if !EV_MULTIPLICITY instead of #ifndef because it should be defined always.

[software/libev.git] / ev_port.c

diff --git a/ev_port.c b/ev_port.c
index e6555bb62caac0eb8b4002c25b57424031def99d..a84fb7b04770fc0394a5c082a222283585b3ff72 100644 (file)
--- a/ev_port.c
+++ b/ev_port.c
@@ -4,29 +4,37 @@
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * Redistribution and use in source and binary forms, with or without modifica-
+ * tion, are permitted provided that the following conditions are met:
+ * 
+ *   1.  Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ * 
+ *   2.  Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
+ * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
+ * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
+ * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Alternatively, the contents of this file may be used under the terms of
+ * the GNU General Public License ("GPL") version 2 or any later version,
+ * in which case the provisions of the GPL are applicable instead of
+ * the above. If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use your
+ * version of this file under the BSD license, indicate your decision
+ * by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL. If you do not delete the
+ * provisions above, a recipient may use your version of this file under
+ * either the BSD or the GPL.
  */
 
 #include <sys/types.h>
@@ -36,22 +44,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 +60,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 +110,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 +141,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);