optimise ev_now when \!MULTIPLICITY

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 2040103af6234c962a59a14cede0572ddcd1f801..957b71bf74d916f7d81e87c2b9e2f18c7571df0f 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -52,7 +52,7 @@ static void
 epoll_poll (EV_P_ ev_tstamp timeout)
 {
   int i;
 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 (eventcnt < 0)
     {


@@ -75,7 +75,7 @@ epoll_poll (EV_P_ ev_tstamp timeout)
     {
       ev_free (epoll_events);
       epoll_eventmax = array_roundsize (epoll_events, epoll_eventmax << 1);
     {
       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);

     }
 }
 
     }
 }
 


@@ -94,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 = 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 EVMETHOD_EPOLL;
 }


@@ -110,15 +110,10 @@ epoll_destroy (EV_P)
 static void
 epoll_fork (EV_P)
 {
 static void
 epoll_fork (EV_P)
 {

-  for (;;)
-    {
-      epoll_fd = epoll_create (256);
-
-      if (epoll_fd >= 0)
-        break;
+  close (epoll_fd);

 
 

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

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