*** empty log message ***

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 30d1b257f96616f6e72c7d3bfa111a2c7d8bcb62..bb56218d54ec7bd2056edebbe70fb25e663c0b0c 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -42,66 +42,79 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
-  epoll_ctl (epoll_fd, mode, fd, &ev);
-}
-
-static void
-epoll_postfork_child (EV_P)
-{
-  int fd;
-
-  epoll_fd = epoll_create (256);
-  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
-
-  /* re-register interest in fds */
-  for (fd = 0; fd < anfdmax; ++fd)
-    if (anfds [fd].events)//D
-      epoll_modify (EV_A_ fd, EV_NONE, anfds [fd].events);
+  if (expect_false (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, events, eventmax, ceil (timeout * 1000.));
   int i;
+  int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
+
+  if (expect_false (eventcnt < 0))
+    {
+      if (errno != EINTR)
+        syserr ("(libev) epoll_wait");
 
-  if (eventcnt < 0)
-    return;
+      return;
+    }
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
       EV_A_
-      events [i].data.u64,
-      (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
-      | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
+      epoll_events [i].data.u64,
+      (epoll_events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
+      | (epoll_events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
     );
 
   /* if the receive array was full, increase its size */
-  if (expect_false (eventcnt == eventmax))
+  if (expect_false (eventcnt == epoll_eventmax))
     {
-      free (events);
-      eventmax = array_roundsize (events, eventmax << 1);
-      events = malloc (sizeof (struct epoll_event) * eventmax);
+      ev_free (epoll_events);
+      epoll_eventmax = array_nextsize (sizeof (struct epoll_event), epoll_eventmax, epoll_eventmax + 1);
+      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);
+
+  backend_fudge  = 0.; /* kernel sources seem to indicate this to be zero */
+  backend_modify = epoll_modify;
+  backend_poll   = epoll_poll;
+
+  epoll_eventmax = 64; /* intiial number of events receivable per poll */
+  epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
+
+  return EVBACKEND_EPOLL;
+}
+
+void inline_size
+epoll_destroy (EV_P)
+{
+  ev_free (epoll_events);
+}
+
+void inline_size
+epoll_fork (EV_P)
+{
+  close (backend_fd);
 
-  method_fudge  = 1e-3; /* needed to compensate for epoll returning early */
-  method_modify = epoll_modify;
-  method_poll   = epoll_poll;
+  while ((backend_fd = epoll_create (256)) < 0)
+    syserr ("(libev) epoll_create");
 
-  eventmax = 64; /* intiial number of events receivable per poll */
-  events = malloc (sizeof (struct epoll_event) * eventmax);
+  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
 
-  return EVMETHOD_EPOLL;
+  fd_rearm_all (EV_A);
 }