applied fix by chris brody

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index ffb1f05bbc07b3bc533b8e79ed7c11c3fb40c9d9..54a4ccbfbc8cc54f8e208d13f2c98c089f3eb916 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -42,18 +42,25 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
-  if (epoll_ctl (epoll_fd, mode, fd, &ev))
-    fd_kill (EV_A_ fd);
+  if (epoll_ctl (backend_fd, mode, fd, &ev))
+    if (errno != ENOENT /* on ENOENT the fd went away, so try to do the right thing */
+        || (nev && epoll_ctl (backend_fd, EPOLL_CTL_ADD, fd, &ev)))
+      fd_kill (EV_A_ fd);
 }
 
 static void
 epoll_poll (EV_P_ ev_tstamp timeout)
 {
-  int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.));
   int i;
+  int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 
   if (eventcnt < 0)
-    return;
+    {
+      if (errno != EINTR)
+        syserr ("(libev) epoll_wait");
+
+      return;
+    }
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
@@ -66,45 +73,47 @@ epoll_poll (EV_P_ ev_tstamp timeout)
   /* if the receive array was full, increase its size */
   if (expect_false (eventcnt == epoll_eventmax))
     {
-      free (epoll_events);
+      ev_free (epoll_events);
       epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
-      epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
+      epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
     }
 }
 
-static int
+int inline_size
 epoll_init (EV_P_ int flags)
 {
-  epoll_fd = epoll_create (256);
+  backend_fd = epoll_create (256);
 
-  if (epoll_fd < 0)
+  if (backend_fd < 0)
     return 0;
 
-  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
 
-  method_fudge  = 1e-3; /* needed to compensate for epoll returning early */
-  method_modify = epoll_modify;
-  method_poll   = epoll_poll;
+  backend_fudge  = 1e-3; /* needed to compensate for epoll returning early */
+  backend_modify = epoll_modify;
+  backend_poll   = epoll_poll;
 
   epoll_eventmax = 64; /* intiial number of events receivable per poll */
-  epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
+  epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
 
-  return EVMETHOD_EPOLL;
+  return EVBACKEND_EPOLL;
 }
 
-static void
+void inline_size
 epoll_destroy (EV_P)
 {
-  close (epoll_fd);
-
-  free (epoll_events);
+  ev_free (epoll_events);
 }
 
-static void
+void inline_size
 epoll_fork (EV_P)
 {
-  epoll_fd = epoll_create (256);
-  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
+  close (backend_fd);
+
+  while ((backend_fd = epoll_create (256)) < 0)
+    syserr ("(libev) epoll_create");
+
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
 
   fd_rearm_all (EV_A);
 }