*** empty log message ***

[software/libev.git] / ev_kqueue.c

diff --git a/ev_kqueue.c b/ev_kqueue.c
index 8282fea066f934ba94ac8441b14ab0bd735b800c..369d493508e5e605af4d395be02cc16c755f8a9e 100644 (file)
--- a/ev_kqueue.c
+++ b/ev_kqueue.c
@@ -1,30 +1,40 @@
 /*
 /*

- * Copyright 2007      Marc Alexander Lehmann <libev@schmorp.de>
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
+ * libev kqueue backend

  *
  *

- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.

  *
  *

- * 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.
+ * 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.

  *
  *

- * 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,
- * 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>
  */
 
 #include <sys/types.h>


@@ -34,19 +44,13 @@
 #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)
 {
 kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
 {

-  struct kevent *ke;
-
-  array_needsize (kqueue_changes, kqueue_changemax, ++kqueue_changecnt, );
+  ++kqueue_changecnt;
+  array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);

 
 

-  ke = &kqueue_changes [kqueue_changecnt - 1];
-  memset (ke, 0, sizeof (struct kevent));
-  ke->ident  = fd;
-  ke->filter = filter;
-  ke->flags  = flags;
-  ke->fflags = fflags;
+  EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);

 }
 
 #ifndef NOTE_EOF
 }
 
 #ifndef NOTE_EOF


@@ -56,21 +60,23 @@ kqueue_change (EV_P_ int fd, int filter, int flags, int fflags)
 static void
 kqueue_modify (EV_P_ int fd, int oev, int nev)
 {
 static void
 kqueue_modify (EV_P_ int fd, int oev, int nev)
 {

-  if ((oev ^ nev) & EV_READ)
+  if (oev != nev)

     {
     {

-      if (nev & EV_READ)
-        kqueue_change (fd, EVFILT_READ, EV_ADD, NOTE_EOF);
-      else
-        kqueue_change (fd, EVFILT_READ, EV_DELETE, 0);
-    }
+      if (oev & EV_READ)
+        kqueue_change (EV_A_ fd, EVFILT_READ , EV_DELETE, 0);

 
 

-  if ((oev ^ nev) & EV_WRITE)
-    {
-      if (nev & EV_WRITE)
-        kqueue_change (fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
-      else
-        kqueue_change (fd, EVFILT_WRITE, EV_DELETE, 0);
+      if (oev & EV_WRITE)
+        kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_DELETE, 0);

     }
     }

+
+  /* to detect close/reopen reliably, we have to re-add */
+  /* event requests even when oev == nev */
+
+  if (nev & EV_READ)
+    kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD, NOTE_EOF);
+
+  if (nev & EV_WRITE)
+    kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);

 }
 
 static void
 }
 
 static void


@@ -79,37 +85,55 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
   int res, i;
   struct timespec ts;
 
   int res, i;
   struct timespec ts;
 

+  /* need to resize so there is enough space for errors */
+  if (kqueue_changecnt > kqueue_eventmax)
+    {
+      ev_free (kqueue_events);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
+      kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
+    }
+

   ts.tv_sec  = (time_t)timeout;
   ts.tv_sec  = (time_t)timeout;

-  ts.tv_nsec = (long)(timeout - (ev_tstamp)ts.tv_sec) * 1e9;
-  res = kevent (kqueue_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
+  ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
+  res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);

   kqueue_changecnt = 0;
 
   kqueue_changecnt = 0;
 

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

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

-      if (kqueue_events [i].flags & EV_ERROR)
+      int fd = kqueue_events [i].ident;
+
+      if (expect_false (kqueue_events [i].flags & EV_ERROR))

         {
         {

-          /* 
-           * Error messages that can happen, when a delete fails.
-           *   EBADF happens when the file discriptor has been
-           *   closed,
-           *   ENOENT when the file discriptor was closed and
-           *   then reopened.
-           *   EINVAL for some reasons not understood; EINVAL
-           *   should not be returned ever; but FreeBSD does :-\
-           * An error is also indicated when a callback deletes
-           * an event we are still processing.  In that case
-           * the data field is set to ENOENT.
-           */
-          if (kqueue_events [i].data == EBADF)
-            fd_kill (EV_A_ kqueue_events [i].ident);
+         int err = kqueue_events [i].data;
+
+          /* we are only interested in errors for fds that we are interested in :) */
+          if (anfds [fd].events)
+           {
+              if (err == ENOENT) /* resubmit changes on ENOENT */
+                kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
+              else if (err == EBADF) /* on EBADF, we re-check the fd */
+                {
+                  if (fd_valid (fd))
+                    kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
+                  else
+                    fd_kill (EV_A_ fd);
+                }
+              else /* on all other errors, we error out on the fd */
+                fd_kill (EV_A_ fd);
+           }

         }
       else
         fd_event (
           EV_A_
         }
       else
         fd_event (
           EV_A_

-          kqueue_events [i].ident,
+          fd,

           kqueue_events [i].filter == EVFILT_READ ? EV_READ
           : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
           : 0
           kqueue_events [i].filter == EVFILT_READ ? EV_READ
           : kqueue_events [i].filter == EVFILT_WRITE ? EV_WRITE
           : 0


@@ -118,47 +142,53 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
 
   if (expect_false (res == kqueue_eventmax))
     {
 
   if (expect_false (res == kqueue_eventmax))
     {

-      free (kqueue_events);
-      kqueue_eventmax = array_roundsize (kqueue_events, kqueue_eventmax << 1);
-      kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax);
+      ev_free (kqueue_events);
+      kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_eventmax + 1);
+      kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);

     }
 }
 
     }
 }
 

-static int
+int inline_size

 kqueue_init (EV_P_ int flags)
 {
 kqueue_init (EV_P_ int flags)
 {

-  struct kevent ch, ev;
-

   /* Initalize the kernel queue */
   /* Initalize the kernel queue */

-  if ((kqueue_fd = kqueue ()) < 0)
+  if ((backend_fd = kqueue ()) < 0)

     return 0;
 
     return 0;
 

-  /* Check for Mac OS X kqueue bug. */
-  ch.ident  = -1;
-  ch.filter = EVFILT_READ;
-  ch.flags  = EV_ADD;
-
-  /* 
-   * If kqueue works, then kevent will succeed, and it will
-   * stick an error in ev. If kqueue is broken, then
-   * kevent will fail.
-   */
-  if (kevent (kqueue_fd, &ch, 1, &ev, 1, 0) != 1
-      || ev.ident != -1
-      || ev.flags != EV_ERROR)
-    {
-      /* detected broken kqueue */
-      close (kqueue_fd);
-      return 0;
-    }
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
+
+  backend_fudge  = 0.;
+  backend_modify = kqueue_modify;
+  backend_poll   = kqueue_poll;
+
+  kqueue_eventmax = 64; /* initial number of events receivable per poll */
+  kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
+
+  kqueue_changes   = 0;
+  kqueue_changemax = 0;
+  kqueue_changecnt = 0;
+
+  return EVBACKEND_KQUEUE;
+}
+
+void inline_size
+kqueue_destroy (EV_P)
+{
+  ev_free (kqueue_events);
+  ev_free (kqueue_changes);
+}
+
+void inline_size
+kqueue_fork (EV_P)
+{
+  close (backend_fd);

 
 

-  method_fudge  = 1e-3; /* needed to compensate for kevent returning early */
-  method_modify = kqueue_modify;
-  method_poll   = kqueue_poll;
+  while ((backend_fd = kqueue ()) < 0)
+    syserr ("(libev) kqueue");

 
 

-  kqueue_eventmax = 64; /* intiial number of events receivable per poll */
-  kqueue_events = malloc (sizeof (struct kevent) * kqueue_eventmax);
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);

 
 

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

 }
 
 }