*** empty log message ***

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index bdd746b18216ba837dc4071e4f6fabbd7b2e66bd..957b71bf74d916f7d81e87c2b9e2f18c7571df0f 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);
 
       (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 (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)
 {
 }
 
 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 i;

+  int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));

 
   if (eventcnt < 0)
 
   if (eventcnt < 0)

-    return;
+    {
+      if (errno != EINTR)
+        syserr ("(libev) epoll_wait");
+
+      return;
+    }

 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (


@@ -66,9 +73,9 @@ epoll_poll (EV_P_ ev_tstamp timeout)
   /* if the receive array was full, increase its size */
   if (expect_false (eventcnt == epoll_eventmax))
     {
   /* 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_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);

     }
 }
 
     }
 }
 


@@ -87,7 +94,7 @@ epoll_init (EV_P_ int flags)
   method_poll   = epoll_poll;
 
   epoll_eventmax = 64; /* intiial number of events receivable per poll */
   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 = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);

 
   return EVMETHOD_EPOLL;
 }
 
   return EVMETHOD_EPOLL;
 }


@@ -97,13 +104,17 @@ epoll_destroy (EV_P)
 {
   close (epoll_fd);
 
 {
   close (epoll_fd);
 

-  free (epoll_events);
+  ev_free (epoll_events);

 }
 
 static void
 epoll_fork (EV_P)
 {
 }
 
 static void
 epoll_fork (EV_P)
 {

-  epoll_fd = epoll_create (256);
+  close (epoll_fd);
+
+  while ((epoll_fd = epoll_create (256)) < 0)
+    syserr ("(libev) epoll_create");
+

   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
   fd_rearm_all (EV_A);
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
   fd_rearm_all (EV_A);