cough

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 300049ed493c9a2111094cc7bf7d31376315db5a..d12e472187c9cee21b65370688916099fe25f6b2 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -28,15 +28,75 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

+
+#ifdef __cplusplus
+extern "C" {
+#endif
+

 #ifndef EV_STANDALONE
 # include "config.h"
 #ifndef EV_STANDALONE
 # include "config.h"

+
+# if HAVE_CLOCK_GETTIME
+#  ifndef EV_USE_MONOTONIC
+#   define EV_USE_MONOTONIC 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
+
+# ifndef EV_USE_SELECT
+#  if HAVE_SELECT && HAVE_SYS_SELECT_H
+#   define EV_USE_SELECT 1
+#  else
+#   define EV_USE_SELECT 0
+#  endif
+# endif
+
+# ifndef EV_USE_POLL
+#  if HAVE_POLL && HAVE_POLL_H
+#   define EV_USE_POLL 1
+#  else
+#   define EV_USE_POLL 0
+#  endif
+# endif
+   
+# 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
+   
+# 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
 
 #include <math.h>
 #include <stdlib.h>
 #endif
 
 #include <math.h>
 #include <stdlib.h>

-#include <unistd.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <signal.h>

 #include <stddef.h>
 
 #include <stdio.h>
 #include <stddef.h>
 
 #include <stdio.h>


@@ -44,24 +104,42 @@
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>

-#ifndef WIN32
+#include <time.h>
+
+#include <signal.h>
+
+#ifndef _WIN32
+# include <unistd.h>
+# include <sys/time.h>

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

+#else
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# ifndef EV_SELECT_IS_WINSOCKET
+#  define EV_SELECT_IS_WINSOCKET 1
+# endif

 #endif
 #endif

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

 
 /**/
 
 #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
 
 #endif
 
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
 

-#ifndef EV_USEV_POLL
-# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
+#ifndef EV_USE_POLL
+# ifdef _WIN32
+#  define EV_USE_POLL 0
+# else
+#  define EV_USE_POLL 1
+# endif

 #endif
 
 #ifndef EV_USE_EPOLL
 #endif
 
 #ifndef EV_USE_EPOLL


@@ -72,8 +150,8 @@
 # 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
 
 /**/


@@ -88,18 +166,26 @@
 # define EV_USE_REALTIME 0
 #endif
 
 # define EV_USE_REALTIME 0
 #endif
 

+#if EV_SELECT_IS_WINSOCKET
+# include <winsock.h>
+#endif
+

 /**/
 
 #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 */

 
 

-#include "ev.h"
+#ifdef EV_H
+# include EV_H
+#else
+# include "ev.h"
+#endif

 
 #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


@@ -111,19 +197,77 @@
 #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 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;
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 

+#ifdef _WIN32
+# include "ev_win32.c"
+#endif
+
+/*****************************************************************************/
+
+static void (*syserr_cb)(const char *msg);
+
+void ev_set_syserr_cb (void (*cb)(const char *msg))
+{
+  syserr_cb = cb;
+}
+
+static void
+syserr (const char *msg)
+{
+  if (!msg)
+    msg = "(libev) system error";
+
+  if (syserr_cb)
+    syserr_cb (msg);
+  else
+    {
+      perror (msg);
+      abort ();
+    }
+}
+
+static void *(*alloc)(void *ptr, long size);
+
+void ev_set_allocator (void *(*cb)(void *ptr, long size))
+{
+  alloc = cb;
+}
+
+static void *
+ev_realloc (void *ptr, long size)
+{
+  ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
+
+  if (!ptr && size)
+    {
+      fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
+      abort ();
+    }
+
+  return ptr;
+}
+
+#define ev_malloc(size) ev_realloc (0, (size))
+#define ev_free(ptr)    ev_realloc ((ptr), 0)
+

 /*****************************************************************************/
 
 typedef struct
 {
 /*****************************************************************************/
 
 typedef struct
 {

-  struct ev_watcher_list *head;
+  WL head;

   unsigned char events;
   unsigned char reify;
   unsigned char events;
   unsigned char reify;

+#if EV_SELECT_IS_WINSOCKET
+  SOCKET handle;
+#endif

 } ANFD;
 
 typedef struct
 } ANFD;
 
 typedef struct


@@ -132,27 +276,35 @@ typedef struct
   int events;
 } ANPENDING;
 
   int events;
 } ANPENDING;
 

-#ifdef EV_MULTIPLICITY
+#if EV_MULTIPLICITY

 
 

-struct ev_loop
-{
-# define VAR(name,decl) decl;
-# include "ev_vars.h"
-};
-# undef VAR
-# include "ev_wrap.h"
+  struct ev_loop
+  {
+    ev_tstamp ev_rt_now;
+    #define ev_rt_now ((loop)->ev_rt_now)
+    #define VAR(name,decl) decl;
+      #include "ev_vars.h"
+    #undef VAR
+  };
+  #include "ev_wrap.h"
+
+  static struct ev_loop default_loop_struct;
+  struct ev_loop *ev_default_loop_ptr;

 
 #else
 
 
 #else
 

-# define VAR(name,decl) static decl;
-# include "ev_vars.h"
-# undef VAR
+  ev_tstamp ev_rt_now;
+  #define VAR(name,decl) static decl;
+    #include "ev_vars.h"
+  #undef VAR
+
+  static int ev_default_loop_ptr;

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

-inline ev_tstamp
+ev_tstamp

 ev_time (void)
 {
 #if EV_USE_REALTIME
 ev_time (void)
 {
 #if EV_USE_REALTIME


@@ -181,29 +333,42 @@ get_clock (void)
   return ev_time ();
 }
 
   return ev_time ();
 }
 

+#if EV_MULTIPLICITY

 ev_tstamp
 ev_now (EV_P)
 {
 ev_tstamp
 ev_now (EV_P)
 {

-  return rt_now;
+  return ev_rt_now;

 }
 }

+#endif

 
 

-#define array_roundsize(base,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))                              \
+    {                                                          \
+      int newcnt = cur;                                                \
+      do                                                       \
+        {                                                      \
+          newcnt = array_roundsize (type, newcnt << 1);                \
+        }                                                      \
+      while ((cnt) > newcnt);                                  \
+                                                               \
+      base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
+      init (base + cur, newcnt - cur);                         \
+      cur = newcnt;                                            \
+    }

 
 

-#define array_needsize(base,cur,cnt,init)              \
-  if (expect_false ((cnt) > cur))                      \
-    {                                                  \
-      int newcnt = cur;                                        \
-      do                                               \
-        {                                              \
-          newcnt = array_roundsize (base, newcnt << 1);        \
-        }                                              \
-      while ((cnt) > newcnt);                          \
-                                                       \
-      base = realloc (base, sizeof (*base) * (newcnt));        \
-      init (base + cur, newcnt - cur);                 \
-      cur = newcnt;                                    \
+#define array_slim(type,stem)                                  \
+  if (stem ## max < array_roundsize (stem ## cnt >> 2))                \
+    {                                                          \
+      stem ## max = array_roundsize (stem ## cnt >> 1);                \
+      base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
+      fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\

     }
 
     }
 

+#define array_free(stem, idx) \
+  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
+

 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void


@@ -219,19 +384,21 @@ anfds_init (ANFD *base, int count)
     }
 }
 
     }
 }
 

-static void
-event (EV_P_ W w, int events)
+void
+ev_feed_event (EV_P_ void *w, int revents)

 {
 {

-  if (w->pending)
+  W w_ = (W)w;
+
+  if (expect_false (w_->pending))

     {
     {

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

       return;
     }
 
       return;
     }
 

-  w->pending = ++pendingcnt [ABSPRI (w)];
-  array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
-  pendings [ABSPRI (w)][w->pending - 1].w      = w;
-  pendings [ABSPRI (w)][w->pending - 1].events = events;
+  w_->pending = ++pendingcnt [ABSPRI (w_)];
+  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;

 }
 
 static void
 }
 
 static void


@@ -240,27 +407,33 @@ queue_events (EV_P_ W *events, int eventcnt, int type)
   int i;
 
   for (i = 0; i < eventcnt; ++i)
   int i;
 
   for (i = 0; i < eventcnt; ++i)

-    event (EV_A_ events [i], type);
+    ev_feed_event (EV_A_ events [i], type);

 }
 
 }
 

-static void
-fd_event (EV_P_ int fd, int events)
+inline void
+fd_event (EV_P_ int fd, int revents)

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

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

 
       if (ev)
 
       if (ev)

-        event (EV_A_ (W)w, ev);
+        ev_feed_event (EV_A_ (W)w, ev);

     }
 }
 
     }
 }
 

+void
+ev_feed_fd_event (EV_P_ int fd, int revents)
+{
+  fd_event (EV_A_ fd, revents);
+}
+

 /*****************************************************************************/
 
 /*****************************************************************************/
 

-static void
+inline void

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


@@ -276,13 +449,19 @@ fd_reify (EV_P)
       for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
         events |= w->events;
 
       for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
         events |= w->events;
 

-      anfd->reify = 0;
-
-      if (anfd->events != events)
+#if EV_SELECT_IS_WINSOCKET
+      if (events)

         {
         {

-          method_modify (EV_A_ fd, anfd->events, events);
-          anfd->events = events;
+          unsigned long argp;
+          anfd->handle = _get_osfhandle (fd);
+          assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));

         }
         }

+#endif
+
+      anfd->reify = 0;
+
+      backend_modify (EV_A_ fd, anfd->events, events);
+      anfd->events = events;

     }
 
   fdchangecnt = 0;
     }
 
   fdchangecnt = 0;


@@ -291,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 || fdchangecnt < 0)
+  if (expect_false (anfds [fd].reify))

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

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

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


@@ -309,10 +488,20 @@ fd_kill (EV_P_ int fd)
   while ((w = (struct ev_io *)anfds [fd].head))
     {
       ev_io_stop (EV_A_ w);
   while ((w = (struct ev_io *)anfds [fd].head))
     {
       ev_io_stop (EV_A_ w);

-      event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
+      ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);

     }
 }
 
     }
 }
 

+inline int
+fd_valid (int fd)
+{
+#ifdef _WIN32
+  return _get_osfhandle (fd) != -1;
+#else
+  return fcntl (fd, F_GETFD) != -1;
+#endif
+}
+

 /* called on EBADF to verify fds */
 static void
 fd_ebadf (EV_P)
 /* called on EBADF to verify fds */
 static void
 fd_ebadf (EV_P)


@@ -321,7 +510,7 @@ fd_ebadf (EV_P)
 
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
 
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)

-      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+      if (!fd_valid (fd) == -1 && errno == EBADF)

         fd_kill (EV_A_ fd);
 }
 
         fd_kill (EV_A_ fd);
 }
 


@@ -329,17 +518,31 @@ fd_ebadf (EV_P)
 static void
 fd_enomem (EV_P)
 {
 static void
 fd_enomem (EV_P)
 {

-  int fd = anfdmax;
+  int fd;

 
 

-  while (fd--)
+  for (fd = anfdmax; fd--; )

     if (anfds [fd].events)
       {
     if (anfds [fd].events)
       {

-        close (fd);

         fd_kill (EV_A_ fd);
         return;
       }
 }
 
         fd_kill (EV_A_ fd);
         return;
       }
 }
 

+/* usually called after fork if backend needs to re-arm all fds from scratch */
+static void
+fd_rearm_all (EV_P)
+{
+  int fd;
+
+  /* this should be highly optimised to not do anything but set a flag */
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].events)
+      {
+        anfds [fd].events = 0;
+        fd_change (EV_A_ fd);
+      }
+}
+

 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void


@@ -350,12 +553,12 @@ upheap (WT *heap, int k)
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];

-      heap [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;

       k >>= 1;
     }
 
   heap [k] = w;
       k >>= 1;
     }
 
   heap [k] = w;

-  heap [k]->active = k + 1;
+  ((W)heap [k])->active = k + 1;

 
 }
 
 
 }
 


@@ -375,19 +578,26 @@ downheap (WT *heap, int N, int k)
         break;
 
       heap [k] = heap [j];
         break;
 
       heap [k] = heap [j];

-      heap [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;

       k = j;
     }
 
   heap [k] = w;
       k = j;
     }
 
   heap [k] = w;

-  heap [k]->active = k + 1;
+  ((W)heap [k])->active = k + 1;
+}
+
+inline void
+adjustheap (WT *heap, int N, int k)
+{
+  upheap (heap, k);
+  downheap (heap, N, k);

 }
 
 /*****************************************************************************/
 
 typedef struct
 {
 }
 
 /*****************************************************************************/
 
 typedef struct
 {

-  struct ev_watcher_list *head;
+  WL head;

   sig_atomic_t volatile gotsig;
 } ANSIG;
 
   sig_atomic_t volatile gotsig;
 } ANSIG;
 


@@ -396,6 +606,7 @@ 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 void
 signals_init (ANSIG *base, int count)
 
 static void
 signals_init (ANSIG *base, int count)


@@ -412,6 +623,10 @@ signals_init (ANSIG *base, int count)
 static void
 sighandler (int signum)
 {
 static void
 sighandler (int signum)
 {

+#if _WIN32
+  signal (signum, sighandler);
+#endif
+

   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)
   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)


@@ -423,10 +638,29 @@ sighandler (int signum)
     }
 }
 
     }
 }
 

+void
+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 == ev_default_loop_ptr));
+#endif
+
+  --signum;
+
+  if (signum < 0 || signum >= signalmax)
+    return;
+
+  signals [signum].gotsig = 0;
+
+  for (w = signals [signum].head; w; w = w->next)
+    ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
+}
+

 static void
 sigcb (EV_P_ struct ev_io *iow, int revents)
 {
 static void
 sigcb (EV_P_ struct ev_io *iow, int revents)
 {

-  struct ev_watcher_list *w;

   int signum;
 
   read (sigpipe [0], &revents, 1);
   int signum;
 
   read (sigpipe [0], &revents, 1);


@@ -434,25 +668,26 @@ sigcb (EV_P_ struct ev_io *iow, int revents)
 
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
 
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)

-      {
-        signals [signum].gotsig = 0;
+      ev_feed_signal_event (EV_A_ signum + 1);
+}

 
 

-        for (w = signals [signum].head; w; w = w->next)
-          event (EV_A_ (W)w, EV_SIGNAL);
-      }
+static void
+fd_intern (int fd)
+{
+#ifdef _WIN32
+  int arg = 1;
+  ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
+#else
+  fcntl (fd, F_SETFD, FD_CLOEXEC);
+  fcntl (fd, F_SETFL, O_NONBLOCK);
+#endif

 }
 
 static void
 siginit (EV_P)
 {
 }
 
 static void
 siginit (EV_P)
 {

-#ifndef WIN32
-  fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
-  fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
-
-  /* rather than sort out wether we really need nb, set it */
-  fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
-  fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
-#endif
+  fd_intern (sigpipe [0]);
+  fd_intern (sigpipe [1]);

 
   ev_io_set (&sigev, sigpipe [0], EV_READ);
   ev_io_start (EV_A_ &sigev);
 
   ev_io_set (&sigev, sigpipe [0], EV_READ);
   ev_io_start (EV_A_ &sigev);


@@ -461,7 +696,11 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-#ifndef WIN32
+static struct ev_child *childs [PID_HASHSIZE];
+
+#ifndef _WIN32
+
+static struct ev_signal childev;

 
 #ifndef WCONTINUED
 # define WCONTINUED 0
 
 #ifndef WCONTINUED
 # define WCONTINUED 0


@@ -475,10 +714,10 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {

-        w->priority = sw->priority; /* need to do it *now* */
-        w->rpid     = pid;
-        w->rstatus  = status;
-        event (EV_A_ (W)w, EV_CHILD);
+        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
+        w->rpid         = pid;
+        w->rstatus      = status;
+        ev_feed_event (EV_A_ (W)w, EV_CHILD);

       }
 }
 
       }
 }
 


@@ -490,7 +729,7 @@ childcb (EV_P_ struct ev_signal *sw, int revents)
   if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
     {
       /* make sure we are called again until all childs have been reaped */
   if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
     {
       /* make sure we are called again until all childs have been reaped */

-      event (EV_A_ (W)sw, EV_SIGNAL);
+      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 event catches that */
 
       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 */


@@ -501,13 +740,16 @@ 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_EPOLL
 # include "ev_epoll.c"
 #endif
 #if EV_USE_KQUEUE
 # include "ev_kqueue.c"
 #endif
 #if EV_USE_EPOLL
 # include "ev_epoll.c"
 #endif

-#if EV_USEV_POLL
+#if EV_USE_POLL

 # include "ev_poll.c"
 #endif
 #if EV_USE_SELECT
 # include "ev_poll.c"
 #endif
 #if EV_USE_SELECT


@@ -530,7 +772,7 @@ ev_version_minor (void)
 static int
 enable_secure (void)
 {
 static int
 enable_secure (void)
 {

-#ifdef WIN32
+#ifdef _WIN32

   return 0;
 #else
   return getuid () != geteuid ()
   return 0;
 #else
   return getuid () != geteuid ()


@@ -538,16 +780,48 @@ enable_secure (void)
 #endif
 }
 
 #endif
 }
 

-int
-ev_method (EV_P)
+unsigned int
+ev_supported_backends (void)

 {
 {

-  return method;
+  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 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
       {


@@ -557,116 +831,227 @@ loop_init (EV_P_ int methods)
       }
 #endif
 
       }
 #endif
 

-      rt_now    = ev_time ();
+      ev_rt_now = ev_time ();

       mn_now    = get_clock ();
       now_floor = mn_now;
       mn_now    = get_clock ();
       now_floor = mn_now;

-      rtmn_diff = rt_now - mn_now;
+      rtmn_diff = ev_rt_now - mn_now;

 
 

-      if (pipe (sigpipe))
-        return 0;
+      if (!(flags & EVFLAG_NOENV)
+          && !enable_secure ()
+          && getenv ("LIBEV_FLAGS"))
+        flags = atoi (getenv ("LIBEV_FLAGS"));

 
 

-      if (methods == EVMETHOD_AUTO)
-        if (!enable_secure () && getenv ("LIBmethodS"))
-          methods = atoi (getenv ("LIBmethodS"));
-        else
-          methods = EVMETHOD_ANY;
+      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 && (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
 #endif

-#if EV_USEV_POLL
-      if (!method && (methods & EVMETHOD_POLL  )) method = poll_init   (EV_A_ methods);
+#if EV_USE_POLL
+      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
 
 #endif
 

-      if (method)
-        {
-          ev_watcher_init (&sigev, sigcb);
-          ev_set_priority (&sigev, EV_MAXPRI);
-          siginit (EV_A);
+      ev_init (&sigev, sigcb);
+      ev_set_priority (&sigev, EV_MAXPRI);
+    }
+}

 
 

-#ifndef WIN32
-          ev_signal_init (&childev, childcb, SIGCHLD);
-          ev_set_priority (&childev, EV_MAXPRI);
-          ev_signal_start (EV_A_ &childev);
-          ev_unref (EV_A); /* child watcher should not keep loop alive */
+static void
+loop_destroy (EV_P)
+{
+  int i;
+
+#if EV_USE_PORT
+  if (backend == EVBACKEND_PORT  ) port_destroy   (EV_A);

 #endif
 #endif

-        }
-    }
+#if EV_USE_KQUEUE
+  if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
+#endif
+#if EV_USE_EPOLL
+  if (backend == EVBACKEND_EPOLL ) epoll_destroy  (EV_A);
+#endif
+#if EV_USE_POLL
+  if (backend == EVBACKEND_POLL  ) poll_destroy   (EV_A);
+#endif
+#if EV_USE_SELECT
+  if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
+#endif
+
+  for (i = NUMPRI; i--; )
+    array_free (pending, [i]);

 
 

-  return method;
+  /* have to use the microsoft-never-gets-it-right macro */
+  array_free (fdchange, EMPTY0);
+  array_free (timer, EMPTY0);
+#if EV_PERIODICS
+  array_free (periodic, EMPTY0);
+#endif
+  array_free (idle, EMPTY0);
+  array_free (prepare, EMPTY0);
+  array_free (check, EMPTY0);
+
+  backend = 0;

 }
 
 }
 

-#ifdef EV_MULTIPLICITY
+static void
+loop_fork (EV_P)
+{
+#if EV_USE_PORT
+  if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);
+#endif
+#if EV_USE_KQUEUE
+  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))
+    {
+      /* default loop */
+
+      ev_ref (EV_A);
+      ev_io_stop (EV_A_ &sigev);
+      close (sigpipe [0]);
+      close (sigpipe [1]);
+
+      while (pipe (sigpipe))
+        syserr ("(libev) error creating pipe");
+
+      siginit (EV_A);
+    }
+
+  postfork = 0;
+}

 
 

+#if EV_MULTIPLICITY

 struct ev_loop *
 struct ev_loop *

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

 {
 {

-  struct ev_loop *loop = (struct ev_loop *)calloc (1, 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_ flags);

 
 

-  loop_init (EV_A_ methods);
+  if (ev_backend (EV_A))
+    return loop;

 
 

-  return loop;
+  return 0;

 }
 
 void
 }
 
 void

-ev_loop_delete (EV_P)
+ev_loop_destroy (EV_P)

 {
 {

-  /*TODO*/
-  free (loop);
+  loop_destroy (EV_A);
+  ev_free (loop);

 }
 
 }
 

-#else
+void
+ev_loop_fork (EV_P)
+{
+  postfork = 1;
+}
+
+#endif

 
 

+#if EV_MULTIPLICITY
+struct ev_loop *
+ev_default_loop_init (unsigned int flags)
+#else

 int
 int

-ev_init (int methods)
+ev_default_loop (unsigned int flags)
+#endif

 {
 {

-  loop_init ();
-}
+  if (sigpipe [0] == sigpipe [1])
+    if (pipe (sigpipe))
+      return 0;

 
 

+  if (!ev_default_loop_ptr)
+    {
+#if EV_MULTIPLICITY
+      struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
+#else
+      ev_default_loop_ptr = 1;

 #endif
 
 #endif
 

-/*****************************************************************************/
+      loop_init (EV_A_ flags);

 
 

-void
-ev_fork_prepare (void)
-{
-  /* nop */
+      if (ev_backend (EV_A))
+        {
+          siginit (EV_A);
+
+#ifndef _WIN32
+          ev_signal_init (&childev, childcb, SIGCHLD);
+          ev_set_priority (&childev, EV_MAXPRI);
+          ev_signal_start (EV_A_ &childev);
+          ev_unref (EV_A); /* child watcher should not keep loop alive */
+#endif
+        }
+      else
+        ev_default_loop_ptr = 0;
+    }
+
+  return ev_default_loop_ptr;

 }
 
 void
 }
 
 void

-ev_fork_parent (void)
+ev_default_destroy (void)

 {
 {

-  /* nop */
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = ev_default_loop_ptr;
+#endif
+
+#ifndef _WIN32
+  ev_ref (EV_A); /* child watcher */
+  ev_signal_stop (EV_A_ &childev);
+#endif
+
+  ev_ref (EV_A); /* signal watcher */
+  ev_io_stop (EV_A_ &sigev);
+
+  close (sigpipe [0]); sigpipe [0] = 0;
+  close (sigpipe [1]); sigpipe [1] = 0;
+
+  loop_destroy (EV_A);

 }
 
 void
 }
 
 void

-ev_fork_child (void)
+ev_default_fork (void)

 {
 {

-  /*TODO*/
-#if !EV_MULTIPLICITY
-#if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL)
-    epoll_postfork_child (EV_A);
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = ev_default_loop_ptr;

 #endif
 
 #endif
 

-  ev_io_stop (EV_A_ &sigev);
-  close (sigpipe [0]);
-  close (sigpipe [1]);
-  pipe (sigpipe);
-  siginit (EV_A);
-#endif
+  if (backend)
+    postfork = 1;

 }
 
 /*****************************************************************************/
 
 }
 
 /*****************************************************************************/
 

-static void
+static int
+any_pending (EV_P)
+{
+  int pri;
+
+  for (pri = NUMPRI; pri--; )
+    if (pendingcnt [pri])
+      return 1;
+
+  return 0;
+}
+
+inline void

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


@@ -676,53 +1061,68 @@ 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;
           {
             p->w->pending = 0;

-            p->w->cb (EV_A_ p->w, p->events);
+            EV_CB_INVOKE (p->w, p->events);

           }
       }
 }
 
           }
       }
 }
 

-static void
+inline void

 timers_reify (EV_P)
 {
 timers_reify (EV_P)
 {

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

     {
       struct ev_timer *w = timers [0];
 
     {
       struct ev_timer *w = timers [0];
 

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

       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));

-          w->at = mn_now + w->repeat;
+
+          ((WT)w)->at += w->repeat;
+          if (((WT)w)->at < mn_now)
+            ((WT)w)->at = mn_now;
+

           downheap ((WT *)timers, timercnt, 0);
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
 
           downheap ((WT *)timers, timercnt, 0);
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
 

-      event (EV_A_ (W)w, EV_TIMEOUT);
+      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);

     }
 }
 
     }
 }
 

-static void
+#if EV_PERIODICS
+inline void

 periodics_reify (EV_P)
 {
 periodics_reify (EV_P)
 {

-  while (periodiccnt && periodics [0]->at <= rt_now)
+  while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)

     {
       struct ev_periodic *w = periodics [0];
 
     {
       struct ev_periodic *w = periodics [0];
 

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

       /* first reschedule or stop timer */
       /* first reschedule or stop timer */

-      if (w->interval)
+      if (w->reschedule_cb)

         {
         {

-          w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
-          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
+          ((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);
+        }
+      else if (w->interval)
+        {
+          ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
 
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
 

-      event (EV_A_ (W)w, EV_PERIODIC);
+      ev_feed_event (EV_A_ (W)w, EV_PERIODIC);

     }
 }
 
     }
 }
 


@@ -736,20 +1136,17 @@ periodics_reschedule (EV_P)
     {
       struct ev_periodic *w = periodics [i];
 
     {
       struct ev_periodic *w = periodics [i];
 

-      if (w->interval)
-        {
-          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
-
-          if (fabs (diff) >= 1e-4)
-            {
-              ev_periodic_stop (EV_A_ w);
-              ev_periodic_start (EV_A_ w);
-
-              i = 0; /* restart loop, inefficient, but time jumps should be rare */
-            }
-        }
+      if (w->reschedule_cb)
+        ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
+      else if (w->interval)
+        ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;

     }
     }

+
+  /* now rebuild the heap */
+  for (i = periodiccnt >> 1; i--; )
+    downheap ((WT *)periodics, periodiccnt, i);

 }
 }

+#endif

 
 inline int
 time_update_monotonic (EV_P)
 
 inline int
 time_update_monotonic (EV_P)


@@ -758,18 +1155,18 @@ time_update_monotonic (EV_P)
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {

-      rt_now = rtmn_diff + mn_now;
+      ev_rt_now = rtmn_diff + mn_now;

       return 0;
     }
   else
     {
       now_floor = mn_now;
       return 0;
     }
   else
     {
       now_floor = mn_now;

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

       return 1;
     }
 }
 
       return 1;
     }
 }
 

-static void
+inline void

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


@@ -783,17 +1180,19 @@ time_update (EV_P)
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {

-              rtmn_diff = rt_now - mn_now;
+              rtmn_diff = ev_rt_now - mn_now;

 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 
 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 

-              rt_now    = ev_time ();
+              ev_rt_now = ev_time ();

               mn_now    = get_clock ();
               now_floor = mn_now;
             }
 
               mn_now    = get_clock ();
               now_floor = mn_now;
             }
 

+# if EV_PERIODICS

           periodics_reschedule (EV_A);
           periodics_reschedule (EV_A);

+# endif

           /* no timer adjustment, as the monotonic clock doesn't jump */
           /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
         }
           /* no timer adjustment, as the monotonic clock doesn't jump */
           /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
         }


@@ -801,18 +1200,20 @@ time_update (EV_P)
   else
 #endif
     {
   else
 #endif
     {

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

 
 

-      if (expect_false (mn_now > rt_now || mn_now < 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

           periodics_reschedule (EV_A);
           periodics_reschedule (EV_A);

+#endif

 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)

-            timers [i]->at += rt_now - mn_now;
+            ((WT)timers [i])->at += ev_rt_now - mn_now;

         }
 
         }
 

-      mn_now = rt_now;
+      mn_now = ev_rt_now;

     }
 }
 
     }
 }
 


@@ -836,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))


@@ -845,12 +1246,16 @@ ev_loop (EV_P_ int flags)
           call_pending (EV_A);
         }
 
           call_pending (EV_A);
         }
 

+      /* we might have forked, so reify kernel state if necessary */
+      if (expect_false (postfork))
+        loop_fork (EV_A);
+

       /* update fd-related kernel structures */
       fd_reify (EV_A);
 
       /* calculate blocking time */
 
       /* update fd-related kernel structures */
       fd_reify (EV_A);
 
       /* calculate blocking time */
 

-      /* we only need this for !monotonic clockor timers, but as we basically
+      /* we only need this for !monotonic clock or timers, but as we basically

          always have timers, we just calculate it always */
 #if EV_USE_MONOTONIC
       if (expect_true (have_monotonic))
          always have timers, we just calculate it always */
 #if EV_USE_MONOTONIC
       if (expect_true (have_monotonic))


@@ -858,8 +1263,8 @@ ev_loop (EV_P_ int flags)
       else
 #endif
         {
       else
 #endif
         {

-          rt_now = ev_time ();
-          mn_now = rt_now;
+          ev_rt_now = ev_time ();
+          mn_now    = ev_rt_now;

         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)


@@ -870,39 +1275,45 @@ ev_loop (EV_P_ int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

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

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

+#if EV_PERIODICS

           if (periodiccnt)
             {
           if (periodiccnt)
             {

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

               if (block > to) block = to;
             }
               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 rt_now, do magic */
+      /* update ev_rt_now, do magic */

       time_update (EV_A);
 
       /* queue pending timers and reschedule them */
       timers_reify (EV_A); /* relative timers called last */
       time_update (EV_A);
 
       /* queue pending timers and reschedule them */
       timers_reify (EV_A); /* relative timers called last */

+#if EV_PERIODICS

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

+#endif

 
       /* queue idle watchers unless io or timers are pending */
 
       /* queue idle watchers unless io or timers are pending */

-      if (!pendingcnt)
+      if (idlecnt && !any_pending (EV_A))

         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;


@@ -972,13 +1383,13 @@ 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));
 
   ev_start (EV_A_ (W)w, 1);
     return;
 
   assert (("ev_io_start called with negative fd", fd >= 0));
 
   ev_start (EV_A_ (W)w, 1);

-  array_needsize (anfds, anfdmax, fd + 1, anfds_init);
+  array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);

   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
   fd_change (EV_A_ fd);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
   fd_change (EV_A_ fd);


@@ -988,9 +1399,11 @@ 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;
 
     return;
 

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

   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
 
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
 


@@ -1000,33 +1413,37 @@ 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;
 
     return;
 

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

 
   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 (timers, timermax, timercnt, );
+  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);

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

 }
 
 void
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 }
 
 void
 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;
 
     return;
 

-  if (w->active < timercnt--)
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
+
+  if (expect_true (((W)w)->active < timercnt--))

     {
     {

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

     }
 
     }
 

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

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


@@ -1038,98 +1455,78 @@ ev_timer_again (EV_P_ struct ev_timer *w)
     {
       if (w->repeat)
         {
     {
       if (w->repeat)
         {

-          w->at = mn_now + w->repeat;
-          downheap ((WT *)timers, timercnt, w->active - 1);
+          ((WT)w)->at = mn_now + w->repeat;
+          adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);

         }
       else
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
         }
       else
         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

 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;
 
     return;
 

-  assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
-
-  /* this formula differs from the one in periodic_reify because we do not always round up */
-  if (w->interval)
-    w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
+  if (w->reschedule_cb)
+    ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
+  else if (w->interval)
+    {
+      assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
+      /* this formula differs from the one in periodic_reify because we do not always round up */
+      ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
+    }

 
   ev_start (EV_A_ (W)w, ++periodiccnt);
 
   ev_start (EV_A_ (W)w, ++periodiccnt);

-  array_needsize (periodics, periodicmax, periodiccnt, );
+  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);

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

 }
 
 void
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 }
 
 void
 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;
 
     return;
 

-  if (w->active < periodiccnt--)
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
+
+  if (expect_true (((W)w)->active < periodiccnt--))

     {
     {

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

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

-#ifndef SA_RESTART
-# define SA_RESTART 0
-#endif
-

 void
 void

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

 {
 {

-  if (ev_is_active (w))
-    return;
-
-  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
-
-  ev_start (EV_A_ (W)w, 1);
-  array_needsize (signals, signalmax, w->signum, signals_init);
-  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
-
-  if (!w->next)
-    {
-      struct sigaction sa;
-      sa.sa_handler = sighandler;
-      sigfillset (&sa.sa_mask);
-      sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
-      sigaction (w->signum, &sa, 0);
-    }
-}
-
-void
-ev_signal_stop (EV_P_ struct ev_signal *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (!ev_is_active (w))
-    return;
-
-  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
-  ev_stop (EV_A_ (W)w);
-
-  if (!signals [w->signum - 1].head)
-    signal (w->signum, SIG_DFL);
+  /* TODO: use adjustheap and recalculation */
+  ev_periodic_stop (EV_A_ w);
+  ev_periodic_start (EV_A_ w);

 }
 }

+#endif

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

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


@@ -1137,21 +1534,21 @@ 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;
 
     return;
 

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

   ev_stop (EV_A_ (W)w);
 }
 
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {
   ev_stop (EV_A_ (W)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 (prepares, preparemax, preparecnt, );
+  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);

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


@@ -1159,21 +1556,21 @@ 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;
 
     return;
 

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

   ev_stop (EV_A_ (W)w);
 }
 
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {
   ev_stop (EV_A_ (W)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 (checks, checkmax, checkcnt, );
+  array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);

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


@@ -1181,17 +1578,67 @@ 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];
+  ev_stop (EV_A_ (W)w);
+}
+
+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+
+void
+ev_signal_start (EV_P_ struct ev_signal *w)
+{
+#if EV_MULTIPLICITY
+  assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+#endif
+  if (expect_false (ev_is_active (w)))
+    return;
+
+  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+
+  ev_start (EV_A_ (W)w, 1);
+  array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
+
+  if (!((WL)w)->next)
+    {
+#if _WIN32
+      signal (w->signum, sighandler);
+#else
+      struct sigaction sa;
+      sa.sa_handler = sighandler;
+      sigfillset (&sa.sa_mask);
+      sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
+      sigaction (w->signum, &sa, 0);
+#endif
+    }
+}
+
+void
+ev_signal_stop (EV_P_ struct ev_signal *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))

     return;
 
     return;
 

-  checks [w->active - 1] = checks [--checkcnt];
+  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);

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

+
+  if (!signals [w->signum - 1].head)
+    signal (w->signum, SIG_DFL);

 }
 
 void
 ev_child_start (EV_P_ struct ev_child *w)
 {
 }
 
 void
 ev_child_start (EV_P_ struct ev_child *w)
 {

-  if (ev_is_active (w))
+#if EV_MULTIPLICITY
+  assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+#endif
+  if (expect_false (ev_is_active (w)))

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


@@ -1202,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);


@@ -1227,7 +1674,7 @@ once_cb (EV_P_ struct ev_once *once, int revents)
 
   ev_io_stop (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);
 
   ev_io_stop (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);

-  free (once);
+  ev_free (once);

 
   cb (revents, arg);
 }
 
   cb (revents, arg);
 }


@@ -1247,111 +1694,33 @@ once_cb_to (EV_P_ struct ev_timer *w, int revents)
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {

-  struct ev_once *once = 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;
-
-      ev_watcher_init (&once->io, once_cb_io);
-      if (fd >= 0)
-        {
-          ev_io_set (&once->io, fd, events);
-          ev_io_start (EV_A_ &once->io);
-        }
-
-      ev_watcher_init (&once->to, once_cb_to);
-      if (timeout >= 0.)
-        {
-          ev_timer_set (&once->to, timeout, 0.);
-          ev_timer_start (EV_A_ &once->to);
-        }
+      cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+      return;

     }
     }

-}
-
-/*****************************************************************************/

 
 

-#if 0
+  once->cb  = cb;
+  once->arg = arg;

 
 

-struct ev_io wio;
-
-static void
-sin_cb (struct ev_io *w, int revents)
-{
-  fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
-}
-
-static void
-ocb (struct ev_timer *w, int revents)
-{
-  //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
-  ev_timer_stop (w);
-  ev_timer_start (w);
-}
-
-static void
-scb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "signal %x,%d\n", revents, w->signum);
-  ev_io_stop (&wio);
-  ev_io_start (&wio);
-}
-
-static void
-gcb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "generic %x\n", revents);
-
-}
-
-int main (void)
-{
-  ev_init (0);
-
-  ev_io_init (&wio, sin_cb, 0, EV_READ);
-  ev_io_start (&wio);
-
-  struct ev_timer t[10000];
-
-#if 0
-  int i;
-  for (i = 0; i < 10000; ++i)
+  ev_init (&once->io, once_cb_io);
+  if (fd >= 0)

     {
     {

-      struct ev_timer *w = t + i;
-      ev_watcher_init (w, ocb, i);
-      ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
-      ev_timer_start (w);
-      if (drand48 () < 0.5)
-        ev_timer_stop (w);
+      ev_io_set (&once->io, fd, events);
+      ev_io_start (EV_A_ &once->io);

     }
     }

-#endif

 
 

-  struct ev_timer t1;
-  ev_timer_init (&t1, ocb, 5, 10);
-  ev_timer_start (&t1);
-
-  struct ev_signal sig;
-  ev_signal_init (&sig, scb, SIGQUIT);
-  ev_signal_start (&sig);
-
-  struct ev_check cw;
-  ev_check_init (&cw, gcb);
-  ev_check_start (&cw);
-
-  struct ev_idle iw;
-  ev_idle_init (&iw, gcb);
-  ev_idle_start (&iw);
-
-  ev_loop (0);
-
-  return 0;
+  ev_init (&once->to, once_cb_to);
+  if (timeout >= 0.)
+    {
+      ev_timer_set (&once->to, timeout, 0.);
+      ev_timer_start (EV_A_ &once->to);
+    }

 }
 
 }
 

+#ifdef __cplusplus
+}

 #endif
 
 #endif
 

-
-
-