*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index d951d4ee17549f3b89628819868e68bf1b54908b..255a9cda3768f9598f430461312408552109357e 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -34,7 +34,11 @@ extern "C" {
 #endif
 
 #ifndef EV_STANDALONE
 #endif
 
 #ifndef EV_STANDALONE

-# include "config.h"
+# ifdef EV_CONFIG_H
+#  include EV_CONFIG_H
+# else
+#  include "config.h"
+# endif

 
 # if HAVE_CLOCK_GETTIME
 #  ifndef EV_USE_MONOTONIC
 
 # if HAVE_CLOCK_GETTIME
 #  ifndef EV_USE_MONOTONIC


@@ -43,22 +47,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


@@ -78,9 +113,9 @@ extern "C" {
 #include <signal.h>
 
 #ifndef _WIN32
 #include <signal.h>
 
 #ifndef _WIN32

-# include <unistd.h>

 # include <sys/time.h>
 # include <sys/wait.h>
 # include <sys/time.h>
 # include <sys/wait.h>

+# include <unistd.h>

 #else
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #else
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>


@@ -92,12 +127,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 +154,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 cnanot 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 +177,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,10 +189,19 @@ 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_size                static inline /* inline for codesize */
+# if EV_MINIMAL
+#  define noinline                  __attribute__ ((noinline))
+#  define inline_speed              static noinline
+# else
+#  define noinline
+#  define inline_speed              static inline
+# endif

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

-# define inline                     static
+# define inline_speed               static
+# define inline_minimal             static
+# define noinline

 #endif
 
 #define expect_false(expr) expect ((expr) != 0, 0)
 #endif
 
 #define expect_false(expr) expect ((expr) != 0, 0)


@@ -169,11 +210,12 @@ 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_time *WT;
+typedef ev_watcher *W;
+typedef ev_watcher_list *WL;
+typedef ev_watcher_time *WT;

 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 


@@ -185,12 +227,13 @@ static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 static void (*syserr_cb)(const char *msg);
 
 
 static void (*syserr_cb)(const char *msg);
 

-void ev_set_syserr_cb (void (*cb)(const char *msg))
+void
+ev_set_syserr_cb (void (*cb)(const char *msg))

 {
   syserr_cb = cb;
 }
 
 {
   syserr_cb = cb;
 }
 

-static void
+static void noinline

 syserr (const char *msg)
 {
   if (!msg)
 syserr (const char *msg)
 {
   if (!msg)


@@ -207,7 +250,8 @@ syserr (const char *msg)
 
 static void *(*alloc)(void *ptr, long size);
 
 
 static void *(*alloc)(void *ptr, long size);
 

-void ev_set_allocator (void *(*cb)(void *ptr, long size))
+void
+ev_set_allocator (void *(*cb)(void *ptr, long size))

 {
   alloc = cb;
 }
 {
   alloc = cb;
 }


@@ -259,8 +303,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 +313,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
 


@@ -289,7 +333,7 @@ ev_time (void)
 #endif
 }
 
 #endif
 }
 

-inline ev_tstamp
+ev_tstamp inline_size

 get_clock (void)
 {
 #if EV_USE_MONOTONIC
 get_clock (void)
 {
 #if EV_USE_MONOTONIC


@@ -312,7 +356,7 @@ ev_now (EV_P)
 }
 #endif
 
 }
 #endif
 

-#define array_roundsize(type,n) ((n) | 4 & ~3)
+#define array_roundsize(type,n) (((n) | 4) & ~3)

 
 #define array_needsize(type,base,cur,cnt,init)                 \
   if (expect_false ((cnt) > cur))                              \
 
 #define array_needsize(type,base,cur,cnt,init)                 \
   if (expect_false ((cnt) > cur))                              \


@@ -342,37 +386,24 @@ ev_now (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static void
-anfds_init (ANFD *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->events = EV_NONE;
-      base->reify  = 0;
-
-      ++base;
-    }
-}
-
-void
+void noinline

 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
 
 ev_feed_event (EV_P_ void *w, int revents)
 {
   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;
 }
 

-static void
+void inline_size

 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;


@@ -381,13 +412,28 @@ queue_events (EV_P_ W *events, int eventcnt, int type)
     ev_feed_event (EV_A_ events [i], type);
 }
 
     ev_feed_event (EV_A_ events [i], type);
 }
 

-inline void
+/*****************************************************************************/
+
+void inline_size
+anfds_init (ANFD *base, int count)
+{
+  while (count--)
+    {
+      base->head   = 0;
+      base->events = EV_NONE;
+      base->reify  = 0;
+
+      ++base;
+    }
+}
+
+void inline_speed

 fd_event (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
 fd_event (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;

-  struct ev_io *w;
+  ev_io *w;

 
 

-  for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
+  for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)

     {
       int ev = w->events & revents;
 
     {
       int ev = w->events & revents;
 


@@ -402,9 +448,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents)
   fd_event (EV_A_ fd, revents);
 }
 
   fd_event (EV_A_ fd, revents);
 }
 

-/*****************************************************************************/
-
-static void
+void inline_size

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


@@ -413,11 +457,11 @@ fd_reify (EV_P)
     {
       int fd = fdchanges [i];
       ANFD *anfd = anfds + fd;
     {
       int fd = fdchanges [i];
       ANFD *anfd = anfds + fd;

-      struct ev_io *w;
+      ev_io *w;

 
       int events = 0;
 
 
       int events = 0;
 

-      for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
+      for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)

         events |= w->events;
 
 #if EV_SELECT_IS_WINSOCKET
         events |= w->events;
 
 #if EV_SELECT_IS_WINSOCKET


@@ -431,39 +475,39 @@ 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;
     }
 
   fdchangecnt = 0;
 }
 
       anfd->events = events;
     }
 
   fdchangecnt = 0;
 }
 

-static void
+void inline_size

 fd_change (EV_P_ int fd)
 {
 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;
 }
 

-static void
+void inline_speed

 fd_kill (EV_P_ int fd)
 {
 fd_kill (EV_P_ int fd)
 {

-  struct ev_io *w;
+  ev_io *w;

 
 

-  while ((w = (struct ev_io *)anfds [fd].head))
+  while ((w = (ev_io *)anfds [fd].head))

     {
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
 
     {
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
 

-static int
+int inline_size

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


@@ -474,7 +518,7 @@ fd_valid (int fd)
 }
 
 /* called on EBADF to verify fds */
 }
 
 /* called on EBADF to verify fds */

-static void
+static void noinline

 fd_ebadf (EV_P)
 {
   int fd;
 fd_ebadf (EV_P)
 {
   int fd;


@@ -486,7 +530,7 @@ fd_ebadf (EV_P)
 }
 
 /* called on ENOMEM in select/poll to kill some fds and retry */
 }
 
 /* called on ENOMEM in select/poll to kill some fds and retry */

-static void
+static void noinline

 fd_enomem (EV_P)
 {
   int fd;
 fd_enomem (EV_P)
 {
   int fd;


@@ -499,8 +543,8 @@ fd_enomem (EV_P)
       }
 }
 
       }
 }
 

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

 fd_rearm_all (EV_P)
 {
   int fd;
 fd_rearm_all (EV_P)
 {
   int fd;


@@ -516,7 +560,7 @@ fd_rearm_all (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static void
+void inline_speed

 upheap (WT *heap, int k)
 {
   WT w = heap [k];
 upheap (WT *heap, int k)
 {
   WT w = heap [k];


@@ -533,7 +577,7 @@ upheap (WT *heap, int k)
 
 }
 
 
 }
 

-static void
+void inline_speed

 downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];
 downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];


@@ -557,7 +601,7 @@ downheap (WT *heap, int N, int k)
   ((W)heap [k])->active = k + 1;
 }
 
   ((W)heap [k])->active = k + 1;
 }
 

-inline void
+void inline_size

 adjustheap (WT *heap, int N, int k)
 {
   upheap (heap, k);
 adjustheap (WT *heap, int N, int k)
 {
   upheap (heap, k);


@@ -577,9 +621,9 @@ static int signalmax;
 
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;
 
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;

-static struct ev_io sigev;
+static ev_io sigev;

 
 

-static void
+void inline_size

 signals_init (ANSIG *base, int count)
 {
   while (count--)
 signals_init (ANSIG *base, int count)
 {
   while (count--)


@@ -609,13 +653,13 @@ sighandler (int signum)
     }
 }
 
     }
 }
 

-void
+void noinline

 ev_feed_signal_event (EV_P_ int signum)
 {
   WL w;
 
 #if EV_MULTIPLICITY
 ev_feed_signal_event (EV_P_ int signum)
 {
   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;


@@ -630,7 +674,7 @@ ev_feed_signal_event (EV_P_ int signum)
 }
 
 static void
 }
 
 static void

-sigcb (EV_P_ struct ev_io *iow, int revents)
+sigcb (EV_P_ ev_io *iow, int revents)

 {
   int signum;
 
 {
   int signum;
 


@@ -642,7 +686,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
+void inline_size

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


@@ -654,7 +698,7 @@ fd_intern (int fd)
 #endif
 }
 
 #endif
 }
 

-static void
+static void noinline

 siginit (EV_P)
 {
   fd_intern (sigpipe [0]);
 siginit (EV_P)
 {
   fd_intern (sigpipe [0]);


@@ -667,22 +711,18 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static struct ev_child *childs [PID_HASHSIZE];
+static ev_child *childs [PID_HASHSIZE];

 
 #ifndef _WIN32
 
 
 #ifndef _WIN32
 

-static struct ev_signal childev;
+static ev_signal childev;

 
 

-#ifndef WCONTINUED
-# define WCONTINUED 0
-#endif
-
-static void
-child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
+void inline_speed
+child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)

 {
 {

-  struct ev_child *w;
+  ev_child *w;

 
 

-  for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
+  for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)

     if (w->pid == pid || !w->pid)
       {
         ev_priority (w) = ev_priority (sw); /* need to do it *now* */
     if (w->pid == pid || !w->pid)
       {
         ev_priority (w) = ev_priority (sw); /* need to do it *now* */


@@ -692,25 +732,37 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
       }
 }
 
       }
 }
 

+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
+

 static void
 static void

-childcb (EV_P_ struct ev_signal *sw, int revents)
+childcb (EV_P_ ev_signal *sw, int revents)

 {
   int pid, status;
 
 {
   int pid, status;
 

-  if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
-    {
-      /* make sure we are called again until all childs have been reaped */
-      ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
+  /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
+  if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
+    if (!WCONTINUED
+        || errno != EINVAL
+        || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
+      return;

 
 

-      child_reap (EV_A_ sw, pid, pid, status);
-      child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */
-    }
+  /* make sure we are called again until all childs have been reaped */
+  /* we need to do it this way so that the callback gets called before we continue */
+  ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
+
+  child_reap (EV_A_ sw, pid, pid, status);
+  child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */

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

+#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


@@ -737,7 +789,7 @@ ev_version_minor (void)
 }
 
 /* return true if we are running with elevated privileges and should ignore env variables */
 }
 
 /* return true if we are running with elevated privileges and should ignore env variables */

-static int
+int inline_size

 enable_secure (void)
 {
 #ifdef _WIN32
 enable_secure (void)
 {
 #ifdef _WIN32


@@ -748,16 +800,56 @@ enable_secure (void)
 #endif
 }
 
 #endif
 }
 

-int
-ev_method (EV_P)
+unsigned int
+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_embeddable_backends (void)

 {
 {

-  return method;
+  return EVBACKEND_EPOLL
+       | EVBACKEND_KQUEUE
+       | EVBACKEND_PORT;
+}
+
+unsigned int
+ev_backend (EV_P)
+{
+  return backend;

 }
 
 static void
 }
 
 static void

-loop_init (EV_P_ int methods)
+loop_init (EV_P_ unsigned int flags)

 {
 {

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

     {
 #if EV_USE_MONOTONIC
       {
     {
 #if EV_USE_MONOTONIC
       {


@@ -772,24 +864,29 @@ loop_init (EV_P_ int methods)
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 

-      if (methods == EVMETHOD_AUTO)
-        if (!enable_secure () && getenv ("LIBEV_METHODS"))
-          methods = atoi (getenv ("LIBEV_METHODS"));
-        else
-          methods = EVMETHOD_ANY;
+      if (!(flags & EVFLAG_NOENV)
+          && !enable_secure ()
+          && getenv ("LIBEV_FLAGS"))
+        flags = atoi (getenv ("LIBEV_FLAGS"));

 
 

-      method = 0;
+      if (!(flags & 0x0000ffffUL))
+        flags |= ev_recommended_backends ();
+
+      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 && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
+      if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);

 #endif
 #if EV_USE_EPOLL
 #endif
 #if EV_USE_EPOLL

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

 #endif
 #if EV_USE_POLL
 #endif
 #if EV_USE_POLL

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

 #endif
 #if EV_USE_SELECT
 #endif
 #if EV_USE_SELECT

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

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


@@ -797,48 +894,54 @@ loop_init (EV_P_ int methods)
     }
 }
 
     }
 }
 

-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);
-#if EV_PERIODICS
-  array_free (periodic, EMPTY);
+  array_free (fdchange, EMPTY0);
+  array_free (timer, EMPTY0);
+#if EV_PERIODIC_ENABLE
+  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))


@@ -861,15 +964,15 @@ loop_fork (EV_P)
 
 #if EV_MULTIPLICITY
 struct ev_loop *
 
 #if EV_MULTIPLICITY
 struct ev_loop *

-ev_loop_new (int methods)
+ev_loop_new (unsigned int flags)

 {
   struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
 
   memset (loop, 0, sizeof (struct ev_loop));
 
 {
   struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
 
   memset (loop, 0, sizeof (struct ev_loop));
 

-  loop_init (EV_A_ methods);
+  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 +995,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

+ev_default_loop (unsigned int flags)

 #endif
 #endif

-ev_default_loop (int methods)

 {
   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
 
 #endif
 

-      loop_init (EV_A_ methods);
+      loop_init (EV_A_ flags);

 
 

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

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


@@ -923,17 +1027,17 @@ ev_default_loop (int methods)
 #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,16 +1058,16 @@ 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;
 }
 
 /*****************************************************************************/
 

-static int
+int inline_size

 any_pending (EV_P)
 {
   int pri;
 any_pending (EV_P)
 {
   int pri;


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

-static void
+void inline_speed

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


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

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

           {
           {

+            assert (("non-pending watcher on pending list", p->w->pending));
+

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

-static void
+void inline_size

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

-      struct ev_timer *w = timers [0];
+      ev_timer *w = timers [0];

 
       assert (("inactive timer on timer heap detected", ev_is_active (w)));
 
 
       assert (("inactive timer on timer heap detected", ev_is_active (w)));
 


@@ -1020,21 +1126,20 @@ timers_reify (EV_P)
     }
 }
 
     }
 }
 

-#if EV_PERIODICS
-static void
+#if EV_PERIODIC_ENABLE
+void inline_size

 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)
     {

-      struct ev_periodic *w = periodics [0];
+      ev_periodic *w = periodics [0];

 
       assert (("inactive timer on periodic heap detected", ev_is_active (w)));
 
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
         {
 
       assert (("inactive timer on periodic heap detected", ev_is_active (w)));
 
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
         {

-          ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
-
+          ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);

           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
           downheap ((WT *)periodics, periodiccnt, 0);
         }
           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
           downheap ((WT *)periodics, periodiccnt, 0);
         }


@@ -1051,7 +1156,7 @@ periodics_reify (EV_P)
     }
 }
 
     }
 }
 

-static void
+static void noinline

 periodics_reschedule (EV_P)
 {
   int i;
 periodics_reschedule (EV_P)
 {
   int i;


@@ -1059,7 +1164,7 @@ periodics_reschedule (EV_P)
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {

-      struct ev_periodic *w = periodics [i];
+      ev_periodic *w = periodics [i];

 
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
 
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);


@@ -1073,7 +1178,7 @@ periodics_reschedule (EV_P)
 }
 #endif
 
 }
 #endif
 

-inline int
+int inline_size

 time_update_monotonic (EV_P)
 {
   mn_now = get_clock ();
 time_update_monotonic (EV_P)
 {
   mn_now = get_clock ();


@@ -1091,7 +1196,7 @@ time_update_monotonic (EV_P)
     }
 }
 
     }
 }
 

-static void
+void inline_size

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


@@ -1103,7 +1208,15 @@ time_update (EV_P)
         {
           ev_tstamp odiff = rtmn_diff;
 
         {
           ev_tstamp odiff = rtmn_diff;
 

-          for (i = 4; --i; ) /* loop a few times, before making important decisions */
+          /* loop a few times, before making important decisions.
+           * on the choice of "4": one iteration isn't enough,
+           * in case we get preempted during the calls to
+           * ev_time and get_clock. a second call is almost guarenteed
+           * to succeed in that case, though. and looping a few more times
+           * doesn't hurt either as we only do this on time-jumps or
+           * in the unlikely event of getting preempted here.
+           */
+          for (i = 4; --i; )

             {
               rtmn_diff = ev_rt_now - mn_now;
 
             {
               rtmn_diff = ev_rt_now - mn_now;
 


@@ -1115,7 +1228,7 @@ time_update (EV_P)
               now_floor = mn_now;
             }
 
               now_floor = mn_now;
             }
 

-# if EV_PERIODICS
+# if EV_PERIODIC_ENABLE

           periodics_reschedule (EV_A);
 # endif
           /* no timer adjustment, as the monotonic clock doesn't jump */
           periodics_reschedule (EV_A);
 # endif
           /* no timer adjustment, as the monotonic clock doesn't jump */


@@ -1129,7 +1242,7 @@ time_update (EV_P)
 
       if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
         {
 
       if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
         {

-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE

           periodics_reschedule (EV_A);
 #endif
 
           periodics_reschedule (EV_A);
 #endif
 


@@ -1159,10 +1272,11 @@ static int loop_done;
 void
 ev_loop (EV_P_ int flags)
 {
 void
 ev_loop (EV_P_ int flags)
 {

-  double block;
-  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
+  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
+            ? EVUNLOOP_ONE
+            : EVUNLOOP_CANCEL;

 
 

-  do
+  while (activecnt)

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


@@ -1179,67 +1293,71 @@ ev_loop (EV_P_ int flags)
       fd_reify (EV_A);
 
       /* calculate blocking time */
       fd_reify (EV_A);
 
       /* calculate blocking time */

+      {
+        double block;

 
 

-      /* we only need this for !monotonic clock or timers, but as we basically
-         always have timers, we just calculate it always */
+        if (flags & EVLOOP_NONBLOCK || idlecnt)
+          block = 0.; /* do not block at all */
+        else
+          {
+            /* update time to cancel out callback processing overhead */

 #if EV_USE_MONOTONIC
 #if EV_USE_MONOTONIC

-      if (expect_true (have_monotonic))
-        time_update_monotonic (EV_A);
-      else
+            if (expect_true (have_monotonic))
+              time_update_monotonic (EV_A);
+            else

 #endif
 #endif

-        {
-          ev_rt_now = ev_time ();
-          mn_now    = ev_rt_now;
-        }
+              {
+                ev_rt_now = ev_time ();
+                mn_now    = ev_rt_now;
+              }

 
 

-      if (flags & EVLOOP_NONBLOCK || idlecnt)
-        block = 0.;
-      else
-        {
-          block = MAX_BLOCKTIME;
+            block = MAX_BLOCKTIME;

 
 

-          if (timercnt)
-            {
-              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
-              if (block > to) block = to;
-            }
+            if (timercnt)
+              {
+                ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
+                if (block > to) block = to;
+              }

 
 

-#if EV_PERIODICS
-          if (periodiccnt)
-            {
-              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
-              if (block > to) block = to;
-            }
+#if EV_PERIODIC_ENABLE
+            if (periodiccnt)
+              {
+                ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
+                if (block > to) block = to;
+              }

 #endif
 
 #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);
 
       /* queue pending timers and reschedule them */
       timers_reify (EV_A); /* relative timers called last */
 
       /* update ev_rt_now, do magic */
       time_update (EV_A);
 
       /* queue pending timers and reschedule them */
       timers_reify (EV_A); /* relative timers called last */

-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE

       periodics_reify (EV_A); /* absolute timers called first */
 #endif
 
       periodics_reify (EV_A); /* absolute timers called first */
 #endif
 

-      /* queue idle watchers unless io or timers are pending */
+      /* queue idle watchers unless other events are pending */

       if (idlecnt && !any_pending (EV_A))
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */
       if (idlecnt && !any_pending (EV_A))
         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 == EVUNLOOP_ONE)
+    loop_done = EVUNLOOP_CANCEL;

 }
 
 void
 }
 
 void


@@ -1250,14 +1368,14 @@ ev_unloop (EV_P_ int how)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-inline void
+void inline_size

 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
 
 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
 

-inline void
+void inline_size

 wlist_del (WL *head, WL elem)
 {
   while (*head)
 wlist_del (WL *head, WL elem)
 {
   while (*head)


@@ -1272,7 +1390,7 @@ wlist_del (WL *head, WL elem)
     }
 }
 
     }
 }
 

-inline void
+void inline_speed

 ev_clear_pending (EV_P_ W w)
 {
   if (w->pending)
 ev_clear_pending (EV_P_ W w)
 {
   if (w->pending)


@@ -1282,7 +1400,7 @@ ev_clear_pending (EV_P_ W w)
     }
 }
 
     }
 }
 

-inline void
+void inline_speed

 ev_start (EV_P_ W w, int active)
 {
   if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
 ev_start (EV_P_ W w, int active)
 {
   if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;


@@ -1292,7 +1410,7 @@ ev_start (EV_P_ W w, int active)
   ev_ref (EV_A);
 }
 
   ev_ref (EV_A);
 }
 

-inline void
+void inline_size

 ev_stop (EV_P_ W w)
 {
   ev_unref (EV_A);
 ev_stop (EV_P_ W w)
 {
   ev_unref (EV_A);


@@ -1302,11 +1420,11 @@ ev_stop (EV_P_ W w)
 /*****************************************************************************/
 
 void
 /*****************************************************************************/
 
 void

-ev_io_start (EV_P_ struct ev_io *w)
+ev_io_start (EV_P_ 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));


@@ -1319,10 +1437,10 @@ ev_io_start (EV_P_ struct ev_io *w)
 }
 
 void
 }
 
 void

-ev_io_stop (EV_P_ struct ev_io *w)
+ev_io_stop (EV_P_ ev_io *w)

 {
   ev_clear_pending (EV_A_ (W)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));


@@ -1334,9 +1452,9 @@ ev_io_stop (EV_P_ struct ev_io *w)
 }
 
 void
 }
 
 void

-ev_timer_start (EV_P_ struct ev_timer *w)
+ev_timer_start (EV_P_ 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;


@@ -1344,7 +1462,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 (ev_timer *, timers, timermax, timercnt, EMPTY2);

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


@@ -1352,15 +1470,15 @@ ev_timer_start (EV_P_ struct ev_timer *w)
 }
 
 void
 }
 
 void

-ev_timer_stop (EV_P_ struct ev_timer *w)
+ev_timer_stop (EV_P_ ev_timer *w)

 {
   ev_clear_pending (EV_A_ (W)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);


@@ -1372,7 +1490,7 @@ ev_timer_stop (EV_P_ struct ev_timer *w)
 }
 
 void
 }
 
 void

-ev_timer_again (EV_P_ struct ev_timer *w)
+ev_timer_again (EV_P_ ev_timer *w)

 {
   if (ev_is_active (w))
     {
 {
   if (ev_is_active (w))
     {


@@ -1385,14 +1503,17 @@ ev_timer_again (EV_P_ struct ev_timer *w)
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)

-    ev_timer_start (EV_A_ w);
+    {
+      w->at = w->repeat;
+      ev_timer_start (EV_A_ w);
+    }

 }
 
 }
 

-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE

 void
 void

-ev_periodic_start (EV_P_ struct ev_periodic *w)
+ev_periodic_start (EV_P_ 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)


@@ -1405,7 +1526,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 (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);

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


@@ -1413,15 +1534,15 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
 }
 
 void
 }
 
 void

-ev_periodic_stop (EV_P_ struct ev_periodic *w)
+ev_periodic_stop (EV_P_ ev_periodic *w)

 {
   ev_clear_pending (EV_A_ (W)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);


@@ -1431,7 +1552,7 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w)
 }
 
 void
 }
 
 void

-ev_periodic_again (EV_P_ struct ev_periodic *w)
+ev_periodic_again (EV_P_ ev_periodic *w)

 {
   /* TODO: use adjustheap and recalculation */
   ev_periodic_stop (EV_A_ w);
 {
   /* TODO: use adjustheap and recalculation */
   ev_periodic_stop (EV_A_ w);


@@ -1440,68 +1561,83 @@ ev_periodic_again (EV_P_ struct ev_periodic *w)
 #endif
 
 void
 #endif
 
 void

-ev_idle_start (EV_P_ struct ev_idle *w)
+ev_idle_start (EV_P_ 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 (ev_idle *, idles, idlemax, idlecnt, EMPTY2);

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

-ev_idle_stop (EV_P_ struct ev_idle *w)
+ev_idle_stop (EV_P_ ev_idle *w)

 {
   ev_clear_pending (EV_A_ (W)w);
 {
   ev_clear_pending (EV_A_ (W)w);

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

     return;
 
     return;
 

-  idles [((W)w)->active - 1] = idles [--idlecnt];
+  {
+    int active = ((W)w)->active;
+    idles [active - 1] = idles [--idlecnt];
+    ((W)idles [active - 1])->active = active;
+  }
+

   ev_stop (EV_A_ (W)w);
 }
 
 void
   ev_stop (EV_A_ (W)w);
 }
 
 void

-ev_prepare_start (EV_P_ struct ev_prepare *w)
+ev_prepare_start (EV_P_ 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 (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);

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

-ev_prepare_stop (EV_P_ struct ev_prepare *w)
+ev_prepare_stop (EV_P_ ev_prepare *w)

 {
   ev_clear_pending (EV_A_ (W)w);
 {
   ev_clear_pending (EV_A_ (W)w);

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

     return;
 
     return;
 

-  prepares [((W)w)->active - 1] = prepares [--preparecnt];
+  {
+    int active = ((W)w)->active;
+    prepares [active - 1] = prepares [--preparecnt];
+    ((W)prepares [active - 1])->active = active;
+  }
+

   ev_stop (EV_A_ (W)w);
 }
 
 void
   ev_stop (EV_A_ (W)w);
 }
 
 void

-ev_check_start (EV_P_ struct ev_check *w)
+ev_check_start (EV_P_ 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 (ev_check *, checks, checkmax, checkcnt, EMPTY2);

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

-ev_check_stop (EV_P_ struct ev_check *w)
+ev_check_stop (EV_P_ ev_check *w)

 {
   ev_clear_pending (EV_A_ (W)w);
 {
   ev_clear_pending (EV_A_ (W)w);

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

     return;
 
     return;
 

-  checks [((W)w)->active - 1] = checks [--checkcnt];
+  {
+    int active = ((W)w)->active;
+    checks [active - 1] = checks [--checkcnt];
+    ((W)checks [active - 1])->active = active;
+  }
+

   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 


@@ -1510,12 +1646,12 @@ ev_check_stop (EV_P_ struct ev_check *w)
 #endif
 
 void
 #endif
 
 void

-ev_signal_start (EV_P_ struct ev_signal *w)
+ev_signal_start (EV_P_ ev_signal *w)

 {
 #if EV_MULTIPLICITY
 {
 #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));


@@ -1539,10 +1675,10 @@ ev_signal_start (EV_P_ struct ev_signal *w)
 }
 
 void
 }
 
 void

-ev_signal_stop (EV_P_ struct ev_signal *w)
+ev_signal_stop (EV_P_ ev_signal *w)

 {
   ev_clear_pending (EV_A_ (W)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);


@@ -1553,12 +1689,12 @@ ev_signal_stop (EV_P_ struct ev_signal *w)
 }
 
 void
 }
 
 void

-ev_child_start (EV_P_ struct ev_child *w)
+ev_child_start (EV_P_ ev_child *w)

 {
 #if EV_MULTIPLICITY
 {
 #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);


@@ -1566,22 +1702,138 @@ ev_child_start (EV_P_ struct ev_child *w)
 }
 
 void
 }
 
 void

-ev_child_stop (EV_P_ struct ev_child *w)
+ev_child_stop (EV_P_ ev_child *w)

 {
   ev_clear_pending (EV_A_ (W)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);
   ev_stop (EV_A_ (W)w);
 }
 
     return;
 
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
 }
 

+#if EV_EMBED_ENABLE
+void noinline
+ev_embed_sweep (EV_P_ ev_embed *w)
+{
+  ev_loop (w->loop, EVLOOP_NONBLOCK);
+}
+
+static void
+embed_cb (EV_P_ ev_io *io, int revents)
+{
+  ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
+
+  if (ev_cb (w))
+    ev_feed_event (EV_A_ (W)w, EV_EMBED);
+  else
+    ev_embed_sweep (loop, w);
+}
+
+void
+ev_embed_start (EV_P_ ev_embed *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+
+  {
+    struct ev_loop *loop = w->loop;
+    assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
+    ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
+  }
+
+  ev_set_priority (&w->io, ev_priority (w));
+  ev_io_start (EV_A_ &w->io);
+
+  ev_start (EV_A_ (W)w, 1);
+}
+
+void
+ev_embed_stop (EV_P_ ev_embed *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+
+  ev_io_stop (EV_A_ &w->io);
+
+  ev_stop (EV_A_ (W)w);
+}
+#endif
+
+#if EV_STAT_ENABLE
+
+# ifdef _WIN32
+#  define lstat(a,b) stat(a,b)
+# endif
+
+#define DEF_STAT_INTERVAL 5.0074891
+#define MIN_STAT_INTERVAL 0.1074891
+
+void
+ev_stat_stat (EV_P_ ev_stat *w)
+{
+  if (lstat (w->path, &w->attr) < 0)
+    w->attr.st_nlink = 0;
+  else if (!w->attr.st_nlink)
+    w->attr.st_nlink = 1;
+}
+
+static void
+stat_timer_cb (EV_P_ ev_timer *w_, int revents)
+{
+  ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
+
+  /* we copy this here each the time so that */
+  /* prev has the old value when the callback gets invoked */
+  w->prev = w->attr;
+  ev_stat_stat (EV_A_ w);
+
+  if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
+    ev_feed_event (EV_A_ w, EV_STAT);
+}
+
+void
+ev_stat_start (EV_P_ ev_stat *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+
+  /* since we use memcmp, we need to clear any padding data etc. */
+  memset (&w->prev, 0, sizeof (ev_statdata));
+  memset (&w->attr, 0, sizeof (ev_statdata));
+
+  ev_stat_stat (EV_A_ w);
+
+  if (w->interval < MIN_STAT_INTERVAL)
+    w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
+
+  ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
+  ev_set_priority (&w->timer, ev_priority (w));
+  ev_timer_start (EV_A_ &w->timer);
+
+  ev_start (EV_A_ (W)w, 1);
+}
+
+void
+ev_stat_stop (EV_P_ ev_stat *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+
+  ev_timer_stop (EV_A_ &w->timer);
+
+  ev_stop (EV_A_ (W)w);
+}
+#endif
+

 /*****************************************************************************/
 
 struct ev_once
 {
 /*****************************************************************************/
 
 struct ev_once
 {

-  struct ev_io io;
-  struct ev_timer to;
+  ev_io io;
+  ev_timer to;

   void (*cb)(int revents, void *arg);
   void *arg;
 };
   void (*cb)(int revents, void *arg);
   void *arg;
 };


@@ -1600,13 +1852,13 @@ once_cb (EV_P_ struct ev_once *once, int revents)
 }
 
 static void
 }
 
 static void

-once_cb_io (EV_P_ struct ev_io *w, int revents)
+once_cb_io (EV_P_ ev_io *w, int revents)

 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
 }
 
 static void
 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
 }
 
 static void

-once_cb_to (EV_P_ struct ev_timer *w, int revents)
+once_cb_to (EV_P_ ev_timer *w, int revents)

 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
 }
 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
 }


@@ -1616,26 +1868,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);

     }
 }
 
     }
 }