[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_epoll.c (file contents):
Revision 1.67 by root, Wed Jun 20 12:39:53 2012 UTC vs.
Revision 1.70 by root, Mon Oct 12 17:53:17 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))
         {
           /* pre-2.6.9 kernels require a non-null pointer with EPOLL_CTL_DEL, */
           /* which is fortunately easy to do for us. */
           if (epoll_ctl (backend_fd, want ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, fd, ev))
             {
-              postfork = 1; /* an error occurred, recreate kernel state */
+              postfork |= 2; /* an error occurred, recreate kernel state */
               continue;
             }
         }
       fd_event (EV_A_ fd, got);
       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)

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