- have to re-check potentially closed fds regularly for epoll. this hurts

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index ee7ceea42b50bf8746216e737b0cb31207a26584..4689f8d3b3baf8ad09992f1b8ec1f9b88d8f39e8 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -42,7 +42,10 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 

-  epoll_ctl (epoll_fd, mode, fd, &ev);
+  if (epoll_ctl (epoll_fd, mode, fd, &ev))
+    if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */
+        || (nev && epoll_ctl (epoll_fd, EPOLL_CTL_ADD, fd, &ev)))
+      fd_kill (EV_A_ fd);

 }
 
 static void
 }
 
 static void


@@ -102,11 +105,9 @@ epoll_destroy (EV_P)
 static void
 epoll_fork (EV_P)
 {
 static void
 epoll_fork (EV_P)
 {

-  int fd;
-

   epoll_fd = epoll_create (256);
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
   epoll_fd = epoll_create (256);
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 

-  fd_rearm_all ();
+  fd_rearm_all (EV_A);

 }
 
 }