applied fix by chris brody

[software/libev.git] / ev_port.c

diff --git a/ev_port.c b/ev_port.c
index fb25dff7056092a1a65f596363a32ee7cf09125f..db3bae51f916b05e69251221eae0793842ad2a1f 100644 (file)
--- a/ev_port.c
+++ b/ev_port.c
@@ -1,28 +1,32 @@
 /*
 /*

- * Copyright 2007      Marc Alexander Lehmann <libev@schmorp.de>
+ * libev solaris event port backend
+ *
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  *
  * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions
- * are met:
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.

  *
  *

- * 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.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
+ *     * 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR 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,
+ * 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
  * 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.
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -41,11 +45,11 @@ port_modify (EV_P_ int fd, int oev, int nev)
   if (!nev)
     {
       if (oev)
   if (!nev)
     {
       if (oev)

-        port_dissociate (port_fd, PORT_SOURCE_FD, fd);
+        port_dissociate (backend_fd, PORT_SOURCE_FD, fd);

     }
   else if (0 >
       port_associate (
     }
   else if (0 >
       port_associate (

-         port_fd, PORT_SOURCE_FD, fd,
+         backend_fd, PORT_SOURCE_FD, fd,

          (nev & EV_READ ? POLLIN : 0)
          | (nev & EV_WRITE ? POLLOUT : 0),
          0
          (nev & EV_READ ? POLLIN : 0)
          | (nev & EV_WRITE ? POLLOUT : 0),
          0


@@ -68,7 +72,7 @@ port_poll (EV_P_ ev_tstamp timeout)
 
   ts.tv_sec  = (time_t)timeout;
   ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9;
 
   ts.tv_sec  = (time_t)timeout;
   ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9;

-  res = port_getn (port_fd, port_events, port_eventmax, &nget, &ts);
+  res = port_getn (backend_fd, port_events, port_eventmax, &nget, &ts);

 
   if (res < 0)
     { 
 
   if (res < 0)
     { 


@@ -104,42 +108,40 @@ port_poll (EV_P_ ev_tstamp timeout)
     }
 }
 
     }
 }
 

-static int
+int inline_size

 port_init (EV_P_ int flags)
 {
   /* Initalize the kernel queue */
 port_init (EV_P_ int flags)
 {
   /* Initalize the kernel queue */

-  if ((port_fd = port_create ()) < 0)
+  if ((backend_fd = port_create ()) < 0)

     return 0;
 
     return 0;
 

-  fcntl (port_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */

 
 

-  method_fudge  = 1e-3; /* needed to compensate for port_getn returning early */
-  method_modify = port_modify;
-  method_poll   = port_poll;
+  backend_fudge  = 1e-3; /* needed to compensate for port_getn returning early */
+  backend_modify = port_modify;
+  backend_poll   = port_poll;

 
   port_eventmax = 64; /* intiial number of events receivable per poll */
   port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax);
 
 
   port_eventmax = 64; /* intiial number of events receivable per poll */
   port_events = (port_event_t *)ev_malloc (sizeof (port_event_t) * port_eventmax);
 

-  return EVMETHOD_PORT;
+  return EVBACKEND_PORT;

 }
 
 }
 

-static void
+void inline_size

 port_destroy (EV_P)
 {
 port_destroy (EV_P)
 {

-  close (port_fd);
-

   ev_free (port_events);
 }
 
   ev_free (port_events);
 }
 

-static void
+void inline_size

 port_fork (EV_P)
 {
 port_fork (EV_P)
 {

-  close (port_fd);
+  close (backend_fd);

 
 

-  while ((port_fd = port_create ()) < 0)
+  while ((backend_fd = port_create ()) < 0)

     syserr ("(libev) port");
 
     syserr ("(libev) port");
 

-  fcntl (port_fd, F_SETFD, FD_CLOEXEC);
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);

 
   /* re-register interest in fds */
   fd_rearm_all (EV_A);
 
   /* re-register interest in fds */
   fd_rearm_all (EV_A);