big win32 check-in

[software/libev.git] / ev_kqueue.c

diff --git a/ev_kqueue.c b/ev_kqueue.c
index 8282fea066f934ba94ac8441b14ab0bd735b800c..8d5021fc012e361bdc93bfac8c734ebff5a2c47c 100644 (file)
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -85,7 +85,12 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   kqueue_changecnt = 0;
 
   if (res < 0)
   kqueue_changecnt = 0;
 
   if (res < 0)

-    return;
+    { 
+      if (errno != EINTR)
+        syserr ("(libev) kevent");
+
+      return;
+    } 

 
   for (i = 0; i < res; ++i)
     {
 
   for (i = 0; i < res; ++i)
     {


@@ -118,9 +123,9 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
 
   if (expect_false (res == kqueue_eventmax))
     {
 
   if (expect_false (res == kqueue_eventmax))
     {

-      free (kqueue_events);
+      ev_free (kqueue_events);

       kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1);
       kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1);

-      kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax);
+      kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);

     }
 }
 
     }
 }
 


@@ -133,6 +138,8 @@ kqueue_init (EV_P_ int flags)
   if ((kqueue_fd = kqueue ()) < 0)
     return 0;
 
   if ((kqueue_fd = kqueue ()) < 0)
     return 0;
 

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

   /* Check for Mac OS X kqueue bug. */
   ch.ident  = -1;
   ch.filter = EVFILT_READ;
   /* Check for Mac OS X kqueue bug. */
   ch.ident  = -1;
   ch.filter = EVFILT_READ;


@@ -157,8 +164,35 @@ kqueue_init (EV_P_ int flags)
   method_poll   = kqueue_poll;
 
   kqueue_eventmax = 64; /* intiial number of events receivable per poll */
   method_poll   = kqueue_poll;
 
   kqueue_eventmax = 64; /* intiial number of events receivable per poll */

-  kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax);
+  kqueue_events = ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
+
+  kqueue_changes   = 0;
+  kqueue_changemax = 0;
+  kqueue_changecnt = 0;

 
   return EVMETHOD_KQUEUE;
 }
 
 
   return EVMETHOD_KQUEUE;
 }
 

+static void
+kqueue_destroy (EV_P)
+{
+  close (kqueue_fd);
+
+  ev_free (kqueue_events);
+  ev_free (kqueue_changes);
+}
+
+static void
+kqueue_fork (EV_P)
+{
+  close (kqueue_fd);
+
+  while ((kqueue_fd = kqueue ()) < 0)
+    syserr ("(libev) kqueue");
+
+  fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
+
+  /* re-register interest in fds */
+  fd_rearm_all (EV_A);
+}
+