[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_epoll.c (file contents):
Revision 1.66 by root, Sun Dec 18 17:47:23 2011 UTC vs.
Revision 1.69 by root, Sun Oct 11 13:38:44 2015 UTC

        * we assume that fd is always in range, as we never shrink the anfds array
        */
       if (expect_false ((uint32_t)anfds [fd].egen != (uint32_t)(ev->data.u64 >> 32)))
         {
           /* recreate kernel state */
-          postfork = 1;
+          postfork |= 2;
           continue;
         }
       if (expect_false (got & ~want))
         {
       unsigned char events = anfds [fd].events & (EV_READ | EV_WRITE);
       if (anfds [fd].emask & EV_EMASK_EPERM && events)
         fd_event (EV_A_ fd, events);
       else
+        {
-        epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+          epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
+          anfds [fd].emask = 0;
+        }
     }
 }
 int inline_size
 epoll_init (EV_P_ int flags)
 {
 #ifdef EPOLL_CLOEXEC
   backend_fd = epoll_create1 (EPOLL_CLOEXEC);
-  if (backend_fd < 0)
+  if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS))
 #endif
     backend_fd = epoll_create (256);
   if (backend_fd < 0)
     return 0;

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