[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_kqueue.c (file contents):
Revision 1.53 by root, Sun Feb 12 08:39:38 2012 UTC vs.
Revision 1.54 by root, Mon Apr 2 18:39:54 2012 UTC

 }
 int inline_size
 kqueue_init (EV_P_ int flags)
 {
-  /* Initialize the kernel queue */
+  /* initialize the kernel queue */
+  kqueue_fd_pid = getpid ();
   if ((backend_fd = kqueue ()) < 0)
     return 0;
   fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
 }
 void inline_size
 kqueue_fork (EV_P)
 {
+  /* some BSD kernels don't just destroy the kqueue itself,
+   * but also close the fd, which isn't documented, and
+   * impossible to support properly.
+   * we remember the pid of the kqueue call and only close
+   * the fd if the pid is still the same.
+   * this leaks fds on sane kernels, but BSD interfaces are
+   * notoriously buggy and rarely get fixed.
+   */
+  pid_t newpid = getpid ();
+  if (newpid == kqueue_fd_pid)
-  close (backend_fd);
+    close (backend_fd);
+  kqueue_fd_pid = newpid;
   while ((backend_fd = kqueue ()) < 0)
     ev_syserr ("(libev) kqueue");
   fcntl (backend_fd, F_SETFD, FD_CLOEXEC);

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