fix some aliasing issues again

[software/libev.git] / ev_kqueue.c

diff --git a/ev_kqueue.c b/ev_kqueue.c
index 7a34e9bdec7322373ed3d775ba866edf4b7d2802..149455d609fd2f1ad320257f2743aef51cf76291 100644 (file)
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 

-static void
+void inline_speed

 kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
 {
   struct kevent *ke;
 kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
 {
   struct kevent *ke;


@@ -83,7 +83,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   if (kqueue_changecnt > kqueue_eventmax)
     {
       ev_free (kqueue_events);
   if (kqueue_changecnt > kqueue_eventmax)
     {
       ev_free (kqueue_events);

-      kqueue_eventmax = array_roundsize (struct kevent, kqueue_changecnt);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);

       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 
       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 


@@ -92,7 +92,7 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 
   res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
   kqueue_changecnt = 0;
 

-  if (res < 0)
+  if (expect_false (res < 0))

     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");
     { 
       if (errno != EINTR)
         syserr ("(libev) kevent");


@@ -137,12 +137,12 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   if (expect_false (res == kqueue_eventmax))
     {
       ev_free (kqueue_events);
   if (expect_false (res == kqueue_eventmax))
     {
       ev_free (kqueue_events);

-      kqueue_eventmax = array_roundsize (struct kevent, kqueue_eventmax << 1);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_eventmax + 1);

       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 }
 
       kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
     }
 }
 

-static int
+int inline_size

 kqueue_init (EV_P_ int flags)
 {
   struct kevent ch, ev;
 kqueue_init (EV_P_ int flags)
 {
   struct kevent ch, ev;


@@ -153,8 +153,7 @@ kqueue_init (EV_P_ int flags)
 
   fcntl (backend_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 */
 

-  /* fudge *might* be zero from the documentation, but bsd docs are notoriously wrong */
-  backend_fudge  = 1e-3; /* needed to compensate for kevent returning early */
+  backend_fudge  = 0.;

   backend_modify = kqueue_modify;
   backend_poll   = kqueue_poll;
 
   backend_modify = kqueue_modify;
   backend_poll   = kqueue_poll;
 


@@ -168,16 +167,14 @@ kqueue_init (EV_P_ int flags)
   return EVBACKEND_KQUEUE;
 }
 
   return EVBACKEND_KQUEUE;
 }
 

-static void
+void inline_size

 kqueue_destroy (EV_P)
 {
 kqueue_destroy (EV_P)
 {

-  close (backend_fd);
-

   ev_free (kqueue_events);
   ev_free (kqueue_changes);
 }
 
   ev_free (kqueue_events);
   ev_free (kqueue_changes);
 }
 

-static void
+void inline_size

 kqueue_fork (EV_P)
 {
   close (backend_fd);
 kqueue_fork (EV_P)
 {
   close (backend_fd);