X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/deff62d26ff4c1324816c04c0c6db1e4db435870..17aa769e5683447df8357ac2b0493990b5d85e89:/ev_epoll.c?ds=sidebyside

diff --git a/ev_epoll.c b/ev_epoll.c
index 6bb41bc..7bd7949 100644
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -52,12 +52,12 @@ static void
 epoll_poll (EV_P_ ev_tstamp timeout)
 {
   int i;
-  int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, ceil (timeout * 1000.));
+  int eventcnt = epoll_wait (epoll_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 
   if (eventcnt < 0)
     {
       if (errno != EINTR)
-        syserr ();
+        syserr ("(libev) epoll_wait");
 
       return;
     }
@@ -75,7 +75,7 @@ epoll_poll (EV_P_ ev_tstamp timeout)
     {
       ev_free (epoll_events);
       epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
-      epoll_events = ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
+      epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
     }
 }
 
@@ -89,14 +89,14 @@ epoll_init (EV_P_ int flags)
 
   fcntl (epoll_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 = ev_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
@@ -110,7 +110,11 @@ epoll_destroy (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);