*** empty log message ***

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 38fd3040c35418d9495233c659e951fe4d59092c..bb56218d54ec7bd2056edebbe70fb25e663c0b0c 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -42,7 +42,7 @@ 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 (backend_fd, mode, fd, &ev))
+  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);
     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);


@@ -54,7 +54,7 @@ epoll_poll (EV_P_ ev_tstamp timeout)
   int i;
   int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 
   int i;
   int eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, (int)ceil (timeout * 1000.));
 

-  if (eventcnt < 0)
+  if (expect_false (eventcnt < 0))

     {
       if (errno != EINTR)
         syserr ("(libev) epoll_wait");
     {
       if (errno != EINTR)
         syserr ("(libev) epoll_wait");


@@ -89,7 +89,7 @@ epoll_init (EV_P_ int flags)
 
   fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
 
 
   fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
 

-  backend_fudge  = 1e-3; /* needed to compensate for epoll returning early */
+  backend_fudge  = 0.; /* kernel sources seem to indicate this to be zero */

   backend_modify = epoll_modify;
   backend_poll   = epoll_poll;
 
   backend_modify = epoll_modify;
   backend_poll   = epoll_poll;