*** empty log message ***

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 42e4a8bd05615c0d1154b16a2362404171fdbeaf..11ee92607b30267339dac5fa48a32f2c294adfc3 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -3,44 +3,32 @@
 static int epoll_fd = -1;
 
 static void
-epoll_reify_fd (int fd)
+epoll_modify (int fd, int oev, int nev)
 {
-  ANFD *anfd = anfds + fd;
-  struct ev_io *w;
+  int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
 
-  int wev = 0;
+  struct epoll_event ev;
+  ev.data.fd = fd;
+  ev.events =
+      (nev & EV_READ ? EPOLLIN : 0)
+      | (nev & EV_WRITE ? EPOLLOUT : 0);
 
-  for (w = anfd->head; w; w = w->next)
-    wev |= w->events;
-
-  if (anfd->wev != wev)
-    {
-      int mode = wev ? anfd->wev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
-      struct epoll_event ev;
-      ev.events = wev;
-      ev.data.fd = fd;
-      fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, anfd->wev, wev, mode,//D
-      epoll_ctl (epoll_fd, mode, fd, &ev)
-      );//D
-      anfd->wev = wev;
-    }
+  fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, oev, nev, mode,//D
+  epoll_ctl (epoll_fd, mode, fd, &ev)
+  );//D
 }
 
 void epoll_postfork_child (void)
 {
-  int i;
+  int fd;
 
   epoll_fd = epoll_create (256);
+  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
-  for (i = 0; i < anfdmax; ++i)
-    epoll_reify_fd (i);
-}
-
-static void epoll_reify (void)
-{
-  int i;
-  for (i = 0; i < fdchangecnt; ++i)
-    epoll_reify_fd (fdchanges [i]);
+  /* re-register interest in fds */
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].wev)
+      epoll_modify (fd, EV_NONE, anfds [fd].wev);
 }
 
 static struct epoll_event *events;
@@ -57,8 +45,8 @@ static void epoll_poll (ev_tstamp timeout)
   for (i = 0; i < eventcnt; ++i)
     fd_event (
       events [i].data.fd,
-      (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLPRI) ? EV_WRITE : 0)
-      | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP)           ? EV_READ  : 0)
+      (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
+      | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
     );
 
   /* if the receive array was full, increase its size */
@@ -70,20 +58,20 @@ static void epoll_poll (ev_tstamp timeout)
     }
 }
 
-int epoll_init (int flags)
+void epoll_init (int flags)
 {
   epoll_fd = epoll_create (256);
 
   if (epoll_fd < 0)
-    return 0;
+    return;
 
-  ev_method = EVMETHOD_EPOLL;
-  method_fudge = 1e-3; /* needed to compensate fro epoll returning early */
-  method_reify = epoll_reify;
-  method_poll  = epoll_poll;
+  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
+
+  ev_method     = EVMETHOD_EPOLL;
+  method_fudge  = 1e-3; /* needed to compensate for epoll returning early */
+  method_modify = epoll_modify;
+  method_poll   = epoll_poll;
 
   eventmax = 64; /* intiial number of events receivable per poll */
   events = malloc (sizeof (struct epoll_event) * eventmax);
-
-  return 1;
 }