cough

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 2c341411f0006e487d71153f08097eb87e6219f5..d12e472187c9cee21b65370688916099fe25f6b2 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -43,22 +43,53 @@ extern "C" {
 #  ifndef EV_USE_REALTIME
 #   define EV_USE_REALTIME  1
 #  endif
 #  ifndef EV_USE_REALTIME
 #   define EV_USE_REALTIME  1
 #  endif

+# else
+#  ifndef EV_USE_MONOTONIC
+#   define EV_USE_MONOTONIC 0
+#  endif
+#  ifndef EV_USE_REALTIME
+#   define EV_USE_REALTIME  0
+#  endif

 # endif
 
 # endif
 

-# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
-#  define EV_USE_SELECT 1
+# ifndef EV_USE_SELECT
+#  if HAVE_SELECT && HAVE_SYS_SELECT_H
+#   define EV_USE_SELECT 1
+#  else
+#   define EV_USE_SELECT 0
+#  endif

 # endif
 
 # endif
 

-# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
-#  define EV_USE_POLL 1
+# ifndef EV_USE_POLL
+#  if HAVE_POLL && HAVE_POLL_H
+#   define EV_USE_POLL 1
+#  else
+#   define EV_USE_POLL 0
+#  endif

 # endif
 # endif

-
-# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
-#  define EV_USE_EPOLL 1
+   
+# ifndef EV_USE_EPOLL
+#  if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
+#   define EV_USE_EPOLL 1
+#  else
+#   define EV_USE_EPOLL 0
+#  endif

 # endif
 # endif

-
-# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
-#  define EV_USE_KQUEUE 1
+   
+# ifndef EV_USE_KQUEUE
+#  if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+#   define EV_USE_KQUEUE 1
+#  else
+#   define EV_USE_KQUEUE 0
+#  endif
+# endif
+   
+# ifndef EV_USE_PORT
+#  if HAVE_PORT_H && HAVE_PORT_CREATE
+#   define EV_USE_PORT 1
+#  else
+#   define EV_USE_PORT 0
+#  endif

 # endif
 
 #endif
 # endif
 
 #endif


@@ -92,12 +123,15 @@ extern "C" {
 /**/
 
 #ifndef EV_USE_MONOTONIC
 /**/
 
 #ifndef EV_USE_MONOTONIC

-# define EV_USE_MONOTONIC 1
+# define EV_USE_MONOTONIC 0
+#endif
+
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 0

 #endif
 
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
 
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1

-# define EV_SELECT_USE_FD_SET 1

 #endif
 
 #ifndef EV_USE_POLL
 #endif
 
 #ifndef EV_USE_POLL


@@ -116,18 +150,12 @@ extern "C" {
 # define EV_USE_KQUEUE 0
 #endif
 
 # define EV_USE_KQUEUE 0
 #endif
 

-#ifndef EV_USE_REALTIME
-# define EV_USE_REALTIME 1
+#ifndef EV_USE_PORT
+# define EV_USE_PORT 0

 #endif
 
 /**/
 
 #endif
 
 /**/
 

-/* darwin simply cannot be helped */
-#ifdef __APPLE__
-# undef EV_USE_POLL
-# undef EV_USE_KQUEUE
-#endif
-

 #ifndef CLOCK_MONOTONIC
 # undef EV_USE_MONOTONIC
 # define EV_USE_MONOTONIC 0
 #ifndef CLOCK_MONOTONIC
 # undef EV_USE_MONOTONIC
 # define EV_USE_MONOTONIC 0


@@ -145,9 +173,9 @@ extern "C" {
 /**/
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 /**/
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */

-#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
+#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */

 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */

-/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
+/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */

 
 #ifdef EV_H
 # include EV_H
 
 #ifdef EV_H
 # include EV_H


@@ -157,7 +185,7 @@ extern "C" {
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))

-# define inline                     inline
+# define inline                     static inline

 #else
 # define expect(expr,value)         (expr)
 # define inline                     static
 #else
 # define expect(expr,value)         (expr)
 # define inline                     static


@@ -169,7 +197,8 @@ extern "C" {
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 #define ABSPRI(w) ((w)->priority - EV_MINPRI)
 
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 #define ABSPRI(w) ((w)->priority - EV_MINPRI)
 

-#define EMPTY /* required for microsofts broken pseudo-c compiler */
+#define EMPTY0      /* required for microsofts broken pseudo-c compiler */
+#define EMPTY2(a,b) /* used to suppress some warnings */

 
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;


@@ -259,8 +288,8 @@ typedef struct
   };
   #include "ev_wrap.h"
 
   };
   #include "ev_wrap.h"
 

-  struct ev_loop default_loop_struct;
-  static struct ev_loop *default_loop;
+  static struct ev_loop default_loop_struct;
+  struct ev_loop *ev_default_loop_ptr;

 
 #else
 
 
 #else
 


@@ -269,7 +298,7 @@ typedef struct
     #include "ev_vars.h"
   #undef VAR
 
     #include "ev_vars.h"
   #undef VAR
 

-  static int default_loop;
+  static int ev_default_loop_ptr;

 
 #endif
 
 
 #endif
 


@@ -360,14 +389,14 @@ ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
 
 {
   W w_ = (W)w;
 

-  if (w_->pending)
+  if (expect_false (w_->pending))

     {
       pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;
     }
 
   w_->pending = ++pendingcnt [ABSPRI (w_)];
     {
       pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;
     }
 
   w_->pending = ++pendingcnt [ABSPRI (w_)];

-  array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
+  array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);

   pendings [ABSPRI (w_)][w_->pending - 1].w      = w_;
   pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
 }
   pendings [ABSPRI (w_)][w_->pending - 1].w      = w_;
   pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
 }


@@ -404,7 +433,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static void
+inline void

 fd_reify (EV_P)
 {
   int i;
 fd_reify (EV_P)
 {
   int i;


@@ -431,7 +460,7 @@ fd_reify (EV_P)
 
       anfd->reify = 0;
 
 
       anfd->reify = 0;
 

-      method_modify (EV_A_ fd, anfd->events, events);
+      backend_modify (EV_A_ fd, anfd->events, events);

       anfd->events = events;
     }
 
       anfd->events = events;
     }
 


@@ -441,13 +470,13 @@ fd_reify (EV_P)
 static void
 fd_change (EV_P_ int fd)
 {
 static void
 fd_change (EV_P_ int fd)
 {

-  if (anfds [fd].reify)
+  if (expect_false (anfds [fd].reify))

     return;
 
   anfds [fd].reify = 1;
 
   ++fdchangecnt;
     return;
 
   anfds [fd].reify = 1;
 
   ++fdchangecnt;

-  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
+  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);

   fdchanges [fdchangecnt - 1] = fd;
 }
 
   fdchanges [fdchangecnt - 1] = fd;
 }
 


@@ -463,7 +492,7 @@ fd_kill (EV_P_ int fd)
     }
 }
 
     }
 }
 

-static int
+inline int

 fd_valid (int fd)
 {
 #ifdef _WIN32
 fd_valid (int fd)
 {
 #ifdef _WIN32


@@ -499,7 +528,7 @@ fd_enomem (EV_P)
       }
 }
 
       }
 }
 

-/* usually called after fork if method needs to re-arm all fds from scratch */
+/* usually called after fork if backend needs to re-arm all fds from scratch */

 static void
 fd_rearm_all (EV_P)
 {
 static void
 fd_rearm_all (EV_P)
 {


@@ -615,7 +644,7 @@ ev_feed_signal_event (EV_P_ int signum)
   WL w;
 
 #if EV_MULTIPLICITY
   WL w;
 
 #if EV_MULTIPLICITY

-  assert (("feeding signal events is only supported in the default loop", loop == default_loop));
+  assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));

 #endif
 
   --signum;
 #endif
 
   --signum;


@@ -642,7 +671,7 @@ sigcb (EV_P_ struct ev_io *iow, int revents)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 

-inline void
+static void

 fd_intern (int fd)
 {
 #ifdef _WIN32
 fd_intern (int fd)
 {
 #ifdef _WIN32


@@ -711,6 +740,9 @@ childcb (EV_P_ struct ev_signal *sw, int revents)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

+#if EV_USE_PORT
+# include "ev_port.c"
+#endif

 #if EV_USE_KQUEUE
 # include "ev_kqueue.c"
 #endif
 #if EV_USE_KQUEUE
 # include "ev_kqueue.c"
 #endif


@@ -749,15 +781,47 @@ enable_secure (void)
 }
 
 unsigned int
 }
 
 unsigned int

-ev_method (EV_P)
+ev_supported_backends (void)
+{
+  unsigned int flags = 0;
+
+  if (EV_USE_PORT  ) flags |= EVBACKEND_PORT;
+  if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
+  if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
+  if (EV_USE_POLL  ) flags |= EVBACKEND_POLL;
+  if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
+  
+  return flags;
+}
+
+unsigned int
+ev_recommended_backends (void)
+{
+  unsigned int flags = ev_supported_backends ();
+
+#ifndef __NetBSD__
+  /* kqueue is borked on everything but netbsd apparently */
+  /* it usually doesn't work correctly on anything but sockets and pipes */
+  flags &= ~EVBACKEND_KQUEUE;
+#endif
+#ifdef __APPLE__
+  // flags &= ~EVBACKEND_KQUEUE; for documentation
+  flags &= ~EVBACKEND_POLL;
+#endif
+
+  return flags;
+}
+
+unsigned int
+ev_backend (EV_P)

 {
 {

-  return method;
+  return backend;

 }
 
 static void
 loop_init (EV_P_ unsigned int flags)
 {
 }
 
 static void
 loop_init (EV_P_ unsigned int flags)
 {

-  if (!method)
+  if (!backend)

     {
 #if EV_USE_MONOTONIC
       {
     {
 #if EV_USE_MONOTONIC
       {


@@ -772,24 +836,29 @@ loop_init (EV_P_ unsigned int flags)
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 

-      if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
+      if (!(flags & EVFLAG_NOENV)
+          && !enable_secure ()
+          && getenv ("LIBEV_FLAGS"))

         flags = atoi (getenv ("LIBEV_FLAGS"));
 
         flags = atoi (getenv ("LIBEV_FLAGS"));
 

-      if (!(flags & 0x0000ffff))
-        flags |= 0x0000ffff;
+      if (!(flags & 0x0000ffffUL))
+        flags |= ev_recommended_backends ();

 
 

-      method = 0;
+      backend = 0;
+#if EV_USE_PORT
+      if (!backend && (flags & EVBACKEND_PORT  )) backend = port_init   (EV_A_ flags);
+#endif

 #if EV_USE_KQUEUE
 #if EV_USE_KQUEUE

-      if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);

 #endif
 #if EV_USE_EPOLL
 #endif
 #if EV_USE_EPOLL

-      if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init  (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init  (EV_A_ flags);

 #endif
 #if EV_USE_POLL
 #endif
 #if EV_USE_POLL

-      if (!method && (flags & EVMETHOD_POLL  )) method = poll_init   (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_POLL  )) backend = poll_init   (EV_A_ flags);

 #endif
 #if EV_USE_SELECT
 #endif
 #if EV_USE_SELECT

-      if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);

 #endif
 
       ev_init (&sigev, sigcb);
 #endif
 
       ev_init (&sigev, sigcb);


@@ -797,48 +866,54 @@ loop_init (EV_P_ unsigned int flags)
     }
 }
 
     }
 }
 

-void
+static void

 loop_destroy (EV_P)
 {
   int i;
 
 loop_destroy (EV_P)
 {
   int i;
 

+#if EV_USE_PORT
+  if (backend == EVBACKEND_PORT  ) port_destroy   (EV_A);
+#endif

 #if EV_USE_KQUEUE
 #if EV_USE_KQUEUE

-  if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
+  if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);

 #endif
 #if EV_USE_EPOLL
 #endif
 #if EV_USE_EPOLL

-  if (method == EVMETHOD_EPOLL ) epoll_destroy  (EV_A);
+  if (backend == EVBACKEND_EPOLL ) epoll_destroy  (EV_A);

 #endif
 #if EV_USE_POLL
 #endif
 #if EV_USE_POLL

-  if (method == EVMETHOD_POLL  ) poll_destroy   (EV_A);
+  if (backend == EVBACKEND_POLL  ) poll_destroy   (EV_A);

 #endif
 #if EV_USE_SELECT
 #endif
 #if EV_USE_SELECT

-  if (method == EVMETHOD_SELECT) select_destroy (EV_A);
+  if (backend == EVBACKEND_SELECT) select_destroy (EV_A);

 #endif
 
   for (i = NUMPRI; i--; )
     array_free (pending, [i]);
 
   /* have to use the microsoft-never-gets-it-right macro */
 #endif
 
   for (i = NUMPRI; i--; )
     array_free (pending, [i]);
 
   /* have to use the microsoft-never-gets-it-right macro */

-  array_free (fdchange, EMPTY);
-  array_free (timer, EMPTY);
+  array_free (fdchange, EMPTY0);
+  array_free (timer, EMPTY0);

 #if EV_PERIODICS
 #if EV_PERIODICS

-  array_free (periodic, EMPTY);
+  array_free (periodic, EMPTY0);

 #endif
 #endif

-  array_free (idle, EMPTY);
-  array_free (prepare, EMPTY);
-  array_free (check, EMPTY);
+  array_free (idle, EMPTY0);
+  array_free (prepare, EMPTY0);
+  array_free (check, EMPTY0);

 
 

-  method = 0;
+  backend = 0;

 }
 
 static void
 loop_fork (EV_P)
 {
 }
 
 static void
 loop_fork (EV_P)
 {

-#if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
+#if EV_USE_PORT
+  if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);

 #endif
 #if EV_USE_KQUEUE
 #endif
 #if EV_USE_KQUEUE

-  if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
+  if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
+#endif
+#if EV_USE_EPOLL
+  if (backend == EVBACKEND_EPOLL ) epoll_fork  (EV_A);

 #endif
 
   if (ev_is_active (&sigev))
 #endif
 
   if (ev_is_active (&sigev))


@@ -869,7 +944,7 @@ ev_loop_new (unsigned int flags)
 
   loop_init (EV_A_ flags);
 
 
   loop_init (EV_A_ flags);
 

-  if (ev_method (EV_A))
+  if (ev_backend (EV_A))

     return loop;
 
   return 0;
     return loop;
 
   return 0;


@@ -892,26 +967,27 @@ ev_loop_fork (EV_P)
 
 #if EV_MULTIPLICITY
 struct ev_loop *
 
 #if EV_MULTIPLICITY
 struct ev_loop *

+ev_default_loop_init (unsigned int flags)

 #else
 int
 #else
 int

-#endif

 ev_default_loop (unsigned int flags)
 ev_default_loop (unsigned int flags)

+#endif

 {
   if (sigpipe [0] == sigpipe [1])
     if (pipe (sigpipe))
       return 0;
 
 {
   if (sigpipe [0] == sigpipe [1])
     if (pipe (sigpipe))
       return 0;
 

-  if (!default_loop)
+  if (!ev_default_loop_ptr)

     {
 #if EV_MULTIPLICITY
     {
 #if EV_MULTIPLICITY

-      struct ev_loop *loop = default_loop = &default_loop_struct;
+      struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;

 #else
 #else

-      default_loop = 1;
+      ev_default_loop_ptr = 1;

 #endif
 
       loop_init (EV_A_ flags);
 
 #endif
 
       loop_init (EV_A_ flags);
 

-      if (ev_method (EV_A))
+      if (ev_backend (EV_A))

         {
           siginit (EV_A);
 
         {
           siginit (EV_A);
 


@@ -923,17 +999,17 @@ ev_default_loop (unsigned int flags)
 #endif
         }
       else
 #endif
         }
       else

-        default_loop = 0;
+        ev_default_loop_ptr = 0;

     }
 
     }
 

-  return default_loop;
+  return ev_default_loop_ptr;

 }
 
 void
 ev_default_destroy (void)
 {
 #if EV_MULTIPLICITY
 }
 
 void
 ev_default_destroy (void)
 {
 #if EV_MULTIPLICITY

-  struct ev_loop *loop = default_loop;
+  struct ev_loop *loop = ev_default_loop_ptr;

 #endif
 
 #ifndef _WIN32
 #endif
 
 #ifndef _WIN32


@@ -954,10 +1030,10 @@ void
 ev_default_fork (void)
 {
 #if EV_MULTIPLICITY
 ev_default_fork (void)
 {
 #if EV_MULTIPLICITY

-  struct ev_loop *loop = default_loop;
+  struct ev_loop *loop = ev_default_loop_ptr;

 #endif
 
 #endif
 

-  if (method)
+  if (backend)

     postfork = 1;
 }
 
     postfork = 1;
 }
 


@@ -975,7 +1051,7 @@ any_pending (EV_P)
   return 0;
 }
 
   return 0;
 }
 

-static void
+inline void

 call_pending (EV_P)
 {
   int pri;
 call_pending (EV_P)
 {
   int pri;


@@ -985,7 +1061,7 @@ call_pending (EV_P)
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
 
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
 

-        if (p->w)
+        if (expect_true (p->w))

           {
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);
           {
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);


@@ -993,7 +1069,7 @@ call_pending (EV_P)
       }
 }
 
       }
 }
 

-static void
+inline void

 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)


@@ -1021,7 +1097,7 @@ timers_reify (EV_P)
 }
 
 #if EV_PERIODICS
 }
 
 #if EV_PERIODICS

-static void
+inline void

 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)


@@ -1090,7 +1166,7 @@ time_update_monotonic (EV_P)
     }
 }
 
     }
 }
 

-static void
+inline void

 time_update (EV_P)
 {
   int i;
 time_update (EV_P)
 {
   int i;


@@ -1161,7 +1237,7 @@ ev_loop (EV_P_ int flags)
   double block;
   loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
 
   double block;
   loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
 

-  do
+  while (activecnt)

     {
       /* queue check watchers (and execute them) */
       if (expect_false (preparecnt))
     {
       /* queue check watchers (and execute them) */
       if (expect_false (preparecnt))


@@ -1199,22 +1275,22 @@ ev_loop (EV_P_ int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

-              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
+              ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;

               if (block > to) block = to;
             }
 
 #if EV_PERIODICS
           if (periodiccnt)
             {
               if (block > to) block = to;
             }
 
 #if EV_PERIODICS
           if (periodiccnt)
             {

-              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
+              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;

               if (block > to) block = to;
             }
 #endif
 
               if (block > to) block = to;
             }
 #endif
 

-          if (block < 0.) block = 0.;
+          if (expect_false (block < 0.)) block = 0.;

         }
 
         }
 

-      method_poll (EV_A_ block);
+      backend_poll (EV_A_ block);

 
       /* update ev_rt_now, do magic */
       time_update (EV_A);
 
       /* update ev_rt_now, do magic */
       time_update (EV_A);


@@ -1230,12 +1306,14 @@ ev_loop (EV_P_ int flags)
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */

-      if (checkcnt)
+      if (expect_false (checkcnt))

         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
 
       call_pending (EV_A);
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
 
       call_pending (EV_A);

+
+      if (expect_false (loop_done))
+        break;

     }
     }

-  while (activecnt && !loop_done);

 
   if (loop_done != 2)
     loop_done = 0;
 
   if (loop_done != 2)
     loop_done = 0;


@@ -1305,7 +1383,7 @@ ev_io_start (EV_P_ struct ev_io *w)
 {
   int fd = w->fd;
 
 {
   int fd = w->fd;
 

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   assert (("ev_io_start called with negative fd", fd >= 0));
     return;
 
   assert (("ev_io_start called with negative fd", fd >= 0));


@@ -1321,7 +1399,7 @@ void
 ev_io_stop (EV_P_ struct ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_io_stop (EV_P_ struct ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
     return;
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));


@@ -1335,7 +1413,7 @@ ev_io_stop (EV_P_ struct ev_io *w)
 void
 ev_timer_start (EV_P_ struct ev_timer *w)
 {
 void
 ev_timer_start (EV_P_ struct ev_timer *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ((WT)w)->at += mn_now;
     return;
 
   ((WT)w)->at += mn_now;


@@ -1343,7 +1421,7 @@ ev_timer_start (EV_P_ struct ev_timer *w)
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);

-  array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
+  array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);

   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
 
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
 


@@ -1354,12 +1432,12 @@ void
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
 
     return;
 
   assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
 

-  if (((W)w)->active < timercnt--)
+  if (expect_true (((W)w)->active < timercnt--))

     {
       timers [((W)w)->active - 1] = timers [timercnt];
       adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
     {
       timers [((W)w)->active - 1] = timers [timercnt];
       adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);


@@ -1394,7 +1472,7 @@ ev_timer_again (EV_P_ struct ev_timer *w)
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   if (w->reschedule_cb)
     return;
 
   if (w->reschedule_cb)


@@ -1407,7 +1485,7 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
     }
 
   ev_start (EV_A_ (W)w, ++periodiccnt);
     }
 
   ev_start (EV_A_ (W)w, ++periodiccnt);

-  array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
+  array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);

   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);
 
   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);
 


@@ -1418,12 +1496,12 @@ void
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
 
     return;
 
   assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
 

-  if (((W)w)->active < periodiccnt--)
+  if (expect_true (((W)w)->active < periodiccnt--))

     {
       periodics [((W)w)->active - 1] = periodics [periodiccnt];
       adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
     {
       periodics [((W)w)->active - 1] = periodics [periodiccnt];
       adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);


@@ -1444,11 +1522,11 @@ ev_periodic_again (EV_P_ struct ev_periodic *w)
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);

-  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
+  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);

   idles [idlecnt - 1] = w;
 }
 
   idles [idlecnt - 1] = w;
 }
 


@@ -1456,7 +1534,7 @@ void
 ev_idle_stop (EV_P_ struct ev_idle *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_idle_stop (EV_P_ struct ev_idle *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   idles [((W)w)->active - 1] = idles [--idlecnt];
     return;
 
   idles [((W)w)->active - 1] = idles [--idlecnt];


@@ -1466,11 +1544,11 @@ ev_idle_stop (EV_P_ struct ev_idle *w)
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);

-  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
+  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);

   prepares [preparecnt - 1] = w;
 }
 
   prepares [preparecnt - 1] = w;
 }
 


@@ -1478,7 +1556,7 @@ void
 ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   prepares [((W)w)->active - 1] = prepares [--preparecnt];
     return;
 
   prepares [((W)w)->active - 1] = prepares [--preparecnt];


@@ -1488,11 +1566,11 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w)
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);
     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);

-  array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
+  array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);

   checks [checkcnt - 1] = w;
 }
 
   checks [checkcnt - 1] = w;
 }
 


@@ -1500,7 +1578,7 @@ void
 ev_check_stop (EV_P_ struct ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_check_stop (EV_P_ struct ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   checks [((W)w)->active - 1] = checks [--checkcnt];
     return;
 
   checks [((W)w)->active - 1] = checks [--checkcnt];


@@ -1515,9 +1593,9 @@ void
 ev_signal_start (EV_P_ struct ev_signal *w)
 {
 #if EV_MULTIPLICITY
 ev_signal_start (EV_P_ struct ev_signal *w)
 {
 #if EV_MULTIPLICITY

-  assert (("signal watchers are only supported in the default loop", loop == default_loop));
+  assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));

 #endif
 #endif

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
     return;
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));


@@ -1544,7 +1622,7 @@ void
 ev_signal_stop (EV_P_ struct ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_signal_stop (EV_P_ struct ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
     return;
 
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);


@@ -1558,9 +1636,9 @@ void
 ev_child_start (EV_P_ struct ev_child *w)
 {
 #if EV_MULTIPLICITY
 ev_child_start (EV_P_ struct ev_child *w)
 {
 #if EV_MULTIPLICITY

-  assert (("child watchers are only supported in the default loop", loop == default_loop));
+  assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));

 #endif
 #endif

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, 1);
     return;
 
   ev_start (EV_A_ (W)w, 1);


@@ -1571,7 +1649,7 @@ void
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
     return;
 
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);


@@ -1618,26 +1696,27 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
 {
   struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
 
 {
   struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
 

-  if (!once)
-    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
-  else
+  if (expect_false (!once))

     {
     {

-      once->cb  = cb;
-      once->arg = arg;
+      cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+      return;
+    }

 
 

-      ev_init (&once->io, once_cb_io);
-      if (fd >= 0)
-        {
-          ev_io_set (&once->io, fd, events);
-          ev_io_start (EV_A_ &once->io);
-        }
+  once->cb  = cb;
+  once->arg = arg;

 
 

-      ev_init (&once->to, once_cb_to);
-      if (timeout >= 0.)
-        {
-          ev_timer_set (&once->to, timeout, 0.);
-          ev_timer_start (EV_A_ &once->to);
-        }
+  ev_init (&once->io, once_cb_io);
+  if (fd >= 0)
+    {
+      ev_io_set (&once->io, fd, events);
+      ev_io_start (EV_A_ &once->io);
+    }
+
+  ev_init (&once->to, once_cb_to);
+  if (timeout >= 0.)
+    {
+      ev_timer_set (&once->to, timeout, 0.);
+      ev_timer_start (EV_A_ &once->to);

     }
 }
 
     }
 }