--- libev/ev_epoll.c	2007/11/04 18:29:44	1.16
+++ libev/ev_epoll.c	2007/11/06 00:52:33	1.21
@@ -42,17 +42,25 @@
       (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
 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 (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.));
 
   if (eventcnt < 0)
-    return;
+    {
+      if (errno != EINTR)
+        syserr ("(libev) epoll_wait");
+
+      return;
+    }
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
@@ -65,9 +73,9 @@
   /* 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 = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
     }
 }
 
@@ -86,7 +94,7 @@
   method_poll   = epoll_poll;
 
   epoll_eventmax = 64; /* intiial number of events receivable per poll */
-  epoll_events = malloc (sizeof (struct epoll_event) * epoll_eventmax);
+  epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
 
   return EVMETHOD_EPOLL;
 }
@@ -96,13 +104,22 @@
 {
   close (epoll_fd);
 
-  free (epoll_events);
+  ev_free (epoll_events);
 }
 
 static void
 epoll_fork (EV_P)
 {
-  epoll_fd = epoll_create (256);
+  for (;;)
+    {
+      epoll_fd = epoll_create (256);
+
+      if (epoll_fd >= 0)
+        break;
+
+      syserr ("(libev) epoll_create");
+    }
+
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
   fd_rearm_all (EV_A);