[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_kqueue.c (file contents):
Revision 1.22 by root, Fri Nov 23 05:28:17 2007 UTC vs.
Revision 1.45 by sf-exg, Sat Jul 31 23:00:11 2010 UTC

 /*
+ * libev kqueue backend
+ *
- * Copyright 2007      Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
- * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu>
  * 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 modifica-
- * modification, are permitted provided that the following conditions
+ * tion, are permitted provided that the following conditions are met:
- * 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.
  *
- * 1. Redistributions of source code must retain the above copyright
+ * Alternatively, the contents of this file may be used under the terms of
- *    notice, this list of conditions and the following disclaimer.
+ * the GNU General Public License ("GPL") version 2 or any later version,
- * 2. Redistributions in binary form must reproduce the above copyright
+ * in which case the provisions of the GPL are applicable instead of
- *    notice, this list of conditions and the following disclaimer in the
+ * the above. If you wish to allow the use of your version of this file
- *    documentation and/or other materials provided with the distribution.
+ * only under the terms of the GPL and not to allow others to use your
- * 3. The name of the author may not be used to endorse or promote products
+ * version of this file under the BSD license, indicate your decision
- *    derived from this software without specific prior written permission.
+ * by deleting the provisions above and replace them with the notice
- *
+ * and other provisions required by the GPL. If you do not delete the
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * provisions above, a recipient may use your version of this file under
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * either the BSD or the GPL.
- * 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.
  */
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/queue.h>
 #include <sys/event.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_changecnt;
   array_needsize (struct kevent, kqueue_changes, kqueue_changemax, kqueue_changecnt, EMPTY2);
-  ke = &kqueue_changes [kqueue_changecnt - 1];
+  EV_SET (&kqueue_changes [kqueue_changecnt - 1], fd, filter, flags, fflags, 0, 0);
-  memset (ke, 0, sizeof (struct kevent));
-  ke->ident  = fd;
-  ke->filter = filter;
-  ke->flags  = flags;
-  ke->fflags = fflags;
 }
+/* OS X at least needs this */
+#ifndef EV_ENABLE
+# define EV_ENABLE 0
+#endif
 #ifndef NOTE_EOF
 # define NOTE_EOF 0
 #endif
 static void
   /* 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);
+    kqueue_change (EV_A_ fd, EVFILT_READ , EV_ADD | EV_ENABLE, NOTE_EOF);
   if (nev & EV_WRITE)
-    kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD, NOTE_EOF);
+    kqueue_change (EV_A_ fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, NOTE_EOF);
 }
 static void
 kqueue_poll (EV_P_ ev_tstamp timeout)
 {
   /* need to resize so there is enough space for errors */
   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);
     }
+  EV_RELEASE_CB;
   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);
+  res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
+  EV_ACQUIRE_CB;
   kqueue_changecnt = 0;
-  if (res < 0)
+  if (expect_false (res < 0))
     {
       if (errno != EINTR)
-        syserr ("(libev) kevent");
+        ev_syserr ("(libev) kevent");
       return;
     }
   for (i = 0; i < res; ++i)
     {
       int fd = kqueue_events [i].ident;
-      if (kqueue_events [i].flags & EV_ERROR)
+      if (expect_false (kqueue_events [i].flags & EV_ERROR))
         {
-	  int err = kqueue_events [i].data;
+          int err = kqueue_events [i].data;
-          /*
-           * errors that may happen
-           *   EBADF happens when the file discriptor has been
-           *   closed,
-           *   ENOENT when the file descriptor was closed and
-           *   then reopened.
-           *   EINVAL for some reasons not understood; EINVAL
-           *   should not be returned ever; but FreeBSD does :-\
-           */
           /* 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))
                   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_
           fd,
     }
   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);
     }
 }
-static int
+int inline_size
 kqueue_init (EV_P_ int flags)
 {
-  struct kevent ch, ev;
-  /* Initalize the kernel queue */
+  /* Initialize the kernel queue */
-  if ((kqueue_fd = kqueue ()) < 0)
+  if ((backend_fd = kqueue ()) < 0)
     return 0;
-  fcntl (kqueue_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 */
-  /* Check for Mac OS X kqueue bug. */
+  backend_fudge  = 0.;
-  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;
-    }
-  backend_fudge  = 1e-3; /* needed to compensate for kevent returning early */
   backend_modify = kqueue_modify;
   backend_poll   = kqueue_poll;
-  kqueue_eventmax = 64; /* intiial number of events receivable per 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;
 }
-static void
+void inline_size
 kqueue_destroy (EV_P)
 {
-  close (kqueue_fd);
   ev_free (kqueue_events);
   ev_free (kqueue_changes);
 }
-static void
+void inline_size
 kqueue_fork (EV_P)
 {
-  close (kqueue_fd);
+  close (backend_fd);
-  while ((kqueue_fd = kqueue ()) < 0)
+  while ((backend_fd = kqueue ()) < 0)
-    syserr ("(libev) kqueue");
+    ev_syserr ("(libev) kqueue");
-  fcntl (kqueue_fd, F_SETFD, FD_CLOEXEC);
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
   /* re-register interest in fds */
   fd_rearm_all (EV_A);
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev_kqueue.c (file contents): Revision 1.22 by root, Fri Nov 23 05:28:17 2007 UTC vs. Revision 1.45 by sf-exg, Sat Jul 31 23:00:11 2010 UTC

Diff Legend

Comparing libev/ev_kqueue.c (file contents):
Revision 1.22 by root, Fri Nov 23 05:28:17 2007 UTC vs.
Revision 1.45 by sf-exg, Sat Jul 31 23:00:11 2010 UTC