*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index ffd19c66d08269742f0b3594ee9cf89230e8329a..28ed91b2ac61771d97f8f229f668b72594e7c46a 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev event processing core, watcher management
+ *

  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *


@@ -27,63 +29,232 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef EV_STANDALONE
+# include "config.h"
+
+# if HAVE_CLOCK_GETTIME
+#  define EV_USE_MONOTONIC 1
+#  define EV_USE_REALTIME  1
+# endif
+
+# if HAVE_SELECT && HAVE_SYS_SELECT_H
+#  define EV_USE_SELECT 1
+# endif
+
+# if HAVE_POLL && HAVE_POLL_H
+#  define EV_USE_POLL 1
+# endif
+
+# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
+#  define EV_USE_EPOLL 1
+# endif
+
+# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+#  define EV_USE_KQUEUE 1
+# endif
+
+#endif
+

 #include <math.h>
 #include <stdlib.h>
 #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 <assert.h>
 #include <errno.h>
 #include <stddef.h>
 
 #include <stdio.h>
 
 #include <assert.h>
 #include <errno.h>

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

 #include <time.h>
 
 #include <time.h>
 

-#ifndef HAVE_MONOTONIC
-# ifdef CLOCK_MONOTONIC
-#  define HAVE_MONOTONIC 1
+#include <signal.h>
+
+#ifndef WIN32
+# include <unistd.h>
+# include <sys/time.h>
+# include <sys/wait.h>
+#endif
+/**/
+
+#ifndef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 1
+#endif
+
+#ifndef EV_USE_SELECT
+# define EV_USE_SELECT 1
+#endif
+
+#ifndef EV_USE_POLL
+# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
+#endif
+
+#ifndef EV_USE_EPOLL
+# define EV_USE_EPOLL 0
+#endif
+
+#ifndef EV_USE_KQUEUE
+# define EV_USE_KQUEUE 0
+#endif
+
+#ifndef EV_USE_WIN32
+# ifdef WIN32
+#  define EV_USE_WIN32 0 /* it does not exist, use select */
+#  undef EV_USE_SELECT
+#  define EV_USE_SELECT 1
+# else
+#  define EV_USE_WIN32 0

 # endif
 #endif
 
 # endif
 #endif
 

-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 1

 #endif
 
 #endif
 

-#ifndef HAVE_EPOLL
-# define HAVE_EPOLL 0
+/**/
+
+#ifndef CLOCK_MONOTONIC
+# undef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 0

 #endif
 
 #endif
 

-#ifndef HAVE_REALTIME
-# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
+#ifndef CLOCK_REALTIME
+# undef EV_USE_REALTIME
+# define EV_USE_REALTIME 0

 #endif
 
 #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 60.
+#define MAX_BLOCKTIME 59.731 /* 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 CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
+
+#ifdef EV_H
+# include EV_H
+#else
+# include "ev.h"
+#endif
+
+#if __GNUC__ >= 3
+# define expect(expr,value)         __builtin_expect ((expr),(value))
+# define inline                     inline
+#else
+# define expect(expr,value)         (expr)
+# define inline                     static
+#endif
+
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)

 
 

-#include "ev.h"
+#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define ABSPRI(w) ((w)->priority - EV_MINPRI)

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

-static ev_tstamp now, diff; /* monotonic clock */
-ev_tstamp ev_now;
-int ev_method;
+static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
+
+#include "ev_win32.c"
+
+/*****************************************************************************/
+
+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
+{
+  WL head;
+  unsigned char events;
+  unsigned char reify;
+} ANFD;
+
+typedef struct
+{
+  W w;
+  int events;
+} ANPENDING;
+
+#if EV_MULTIPLICITY
+
+  struct ev_loop
+  {
+    ev_tstamp ev_rt_now;
+    #define VAR(name,decl) decl;
+      #include "ev_vars.h"
+    #undef VAR
+  };
+  #include "ev_wrap.h"
+
+  struct ev_loop default_loop_struct;
+  static struct ev_loop *default_loop;

 
 

-static int have_monotonic; /* runtime */
+#else
+
+  ev_tstamp ev_rt_now;
+  #define VAR(name,decl) static decl;
+    #include "ev_vars.h"
+  #undef VAR

 
 

-static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
-static void (*method_modify)(int fd, int oev, int nev);
-static void (*method_poll)(ev_tstamp timeout);
+  static int default_loop;
+
+#endif

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

-ev_tstamp
+inline ev_tstamp

 ev_time (void)
 {
 ev_time (void)
 {

-#if HAVE_REALTIME
+#if EV_USE_REALTIME

   struct timespec ts;
   clock_gettime (CLOCK_REALTIME, &ts);
   return ts.tv_sec + ts.tv_nsec * 1e-9;
   struct timespec ts;
   clock_gettime (CLOCK_REALTIME, &ts);
   return ts.tv_sec + ts.tv_nsec * 1e-9;


@@ -94,11 +265,11 @@ ev_time (void)
 #endif
 }
 
 #endif
 }
 

-static ev_tstamp
+inline ev_tstamp

 get_clock (void)
 {
 get_clock (void)
 {

-#if HAVE_MONOTONIC
-  if (have_monotonic)
+#if EV_USE_MONOTONIC
+  if (expect_true (have_monotonic))

     {
       struct timespec ts;
       clock_gettime (CLOCK_MONOTONIC, &ts);
     {
       struct timespec ts;
       clock_gettime (CLOCK_MONOTONIC, &ts);


@@ -109,160 +280,280 @@ get_clock (void)
   return ev_time ();
 }
 
   return ev_time ();
 }
 

-#define array_needsize(base,cur,cnt,init)              \
-  if ((cnt) > cur)                                     \
-    {                                                  \
-      int newcnt = cur ? cur << 1 : 16;                        \
-      base = realloc (base, sizeof (*base) * (newcnt));        \
-      init (base + cur, newcnt - cur);                 \
-      cur = newcnt;                                    \
+#if EV_MULTIPLICITY
+ev_tstamp
+ev_now (EV_P)
+{
+  return ev_rt_now;
+}
+#endif
+
+#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_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*/\
+    }

 
 

-typedef struct
-{
-  struct ev_io *head;
-  unsigned char wev, rev; /* want, received event set */
-} ANFD;
+/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
+/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
+#define array_free_microshit(stem) \
+  ev_free (stem ## s); stem ## cnt = stem ## max = 0;

 
 

-static ANFD *anfds;
-static int anfdmax;
+#define array_free(stem, idx) \
+  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;

 
 

-static int *fdchanges;
-static int fdchangemax, fdchangecnt;
+/*****************************************************************************/

 
 static void
 anfds_init (ANFD *base, int count)
 {
   while (count--)
     {
 
 static void
 anfds_init (ANFD *base, int count)
 {
   while (count--)
     {

-      base->head = 0;
-      base->wev = base->rev = EV_NONE;
+      base->head   = 0;
+      base->events = EV_NONE;
+      base->reify  = 0;
+

       ++base;
     }
 }
 
       ++base;
     }
 }
 

-typedef struct
+void
+ev_feed_event (EV_P_ void *w, int revents)

 {
 {

-  W w;
-  int events;
-} ANPENDING;
-
-static ANPENDING *pendings;
-static int pendingmax, pendingcnt;
+  W w_ = (W)w;

 
 

-static void
-event (W w, int events)
-{
-  if (w->active)
+  if (w_->pending)

     {
     {

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

 }
 
 static void
 }
 
 static void

-fd_event (int fd, int events)
+queue_events (EV_P_ W *events, int eventcnt, int type)
+{
+  int i;
+
+  for (i = 0; i < eventcnt; ++i)
+    ev_feed_event (EV_A_ events [i], type);
+}
+
+inline void
+fd_event (EV_P_ int fd, int revents)

 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
 
 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
 

-  for (w = anfd->head; w; w = w->next)
+  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 ((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
 static void

-queue_events (W *events, int eventcnt, int type)
+fd_reify (EV_P)

 {
   int i;
 
 {
   int i;
 

-  for (i = 0; i < eventcnt; ++i)
-    event (events [i], type);
+  for (i = 0; i < fdchangecnt; ++i)
+    {
+      int fd = fdchanges [i];
+      ANFD *anfd = anfds + fd;
+      struct ev_io *w;
+
+      int events = 0;
+
+      for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
+        events |= w->events;
+
+      anfd->reify = 0;
+
+      method_modify (EV_A_ fd, anfd->events, events);
+      anfd->events = events;
+    }
+
+  fdchangecnt = 0;
+}
+
+static void
+fd_change (EV_P_ int fd)
+{
+  if (anfds [fd].reify)
+    return;
+
+  anfds [fd].reify = 1;
+
+  ++fdchangecnt;
+  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
+  fdchanges [fdchangecnt - 1] = fd;
+}
+
+static void
+fd_kill (EV_P_ int fd)
+{
+  struct ev_io *w;
+
+  while ((w = (struct ev_io *)anfds [fd].head))
+    {
+      ev_io_stop (EV_A_ w);
+      ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
+    }
+}
+
+static int
+fd_valid (int fd)
+{
+#ifdef WIN32
+  return !!win32_get_osfhandle (fd);
+#else
+  return fcntl (fd, F_GETFD) != -1;
+#endif

 }
 
 /* called on EBADF to verify fds */
 static void
 }
 
 /* called on EBADF to verify fds */
 static void

-fd_recheck ()
+fd_ebadf (EV_P)

 {
   int fd;
 
   for (fd = 0; fd < anfdmax; ++fd)
 {
   int fd;
 
   for (fd = 0; fd < anfdmax; ++fd)

-    if (anfds [fd].wev)
-      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
-        while (anfds [fd].head)
-          evio_stop (anfds [fd].head);
+    if (anfds [fd].events)
+      if (!fd_valid (fd) == -1 && errno == EBADF)
+        fd_kill (EV_A_ fd);

 }
 
 }
 

-/*****************************************************************************/
+/* called on ENOMEM in select/poll to kill some fds and retry */
+static void
+fd_enomem (EV_P)
+{
+  int fd;
+
+  for (fd = anfdmax; fd--; )
+    if (anfds [fd].events)
+      {
+        fd_kill (EV_A_ fd);
+        return;
+      }
+}
+
+/* usually called after fork if method needs to re-arm all fds from scratch */
+static void
+fd_rearm_all (EV_P)
+{
+  int fd;

 
 

-static struct ev_timer **timers;
-static int timermax, timercnt;
+  /* 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 struct ev_periodic **periodics;
-static int periodicmax, periodiccnt;
+/*****************************************************************************/

 
 static void
 
 static void

-upheap (WT *timers, int k)
+upheap (WT *heap, int k)

 {
 {

-  WT w = timers [k];
+  WT w = heap [k];

 
 

-  while (k && timers [k >> 1]->at > w->at)
+  while (k && heap [k >> 1]->at > w->at)

     {
     {

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

       k >>= 1;
     }
 
       k >>= 1;
     }
 

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

 
 }
 
 static void
 
 }
 
 static void

-downheap (WT *timers, int N, int k)
+downheap (WT *heap, int N, int k)

 {
 {

-  WT w = timers [k];
+  WT w = heap [k];

 
   while (k < (N >> 1))
     {
       int j = k << 1;
 
 
   while (k < (N >> 1))
     {
       int j = k << 1;
 

-      if (j + 1 < N && timers [j]->at > timers [j + 1]->at)
+      if (j + 1 < N && heap [j]->at > heap [j + 1]->at)

         ++j;
 
         ++j;
 

-      if (w->at <= timers [j]->at)
+      if (w->at <= heap [j]->at)

         break;
 
         break;
 

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

       k = j;
     }
 
       k = j;
     }
 

-  timers [k] = w;
-  timers [k]->active = k + 1;
+  heap [k] = w;
+  ((W)heap [k])->active = k + 1;
+}
+
+inline void
+adjustheap (WT *heap, int N, int k, ev_tstamp at)
+{
+  ev_tstamp old_at = heap [k]->at;
+  heap [k]->at = at;
+
+  if (old_at < at)
+    downheap (heap, N, k);
+  else
+    upheap (heap, k);

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

-  struct ev_signal *head;
-  sig_atomic_t gotsig;
+  WL head;
+  sig_atomic_t volatile gotsig;

 } ANSIG;
 
 static ANSIG *signals;
 static int signalmax;
 
 static int sigpipe [2];
 } ANSIG;
 
 static ANSIG *signals;
 static int signalmax;
 
 static int sigpipe [2];

-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;

 static struct ev_io sigev;
 
 static void
 static struct ev_io sigev;
 
 static void


@@ -272,6 +563,7 @@ signals_init (ANSIG *base, int count)
     {
       base->head   = 0;
       base->gotsig = 0;
     {
       base->head   = 0;
       base->gotsig = 0;

+

       ++base;
     }
 }
       ++base;
     }
 }


@@ -279,215 +571,466 @@ 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)
     {

+      int old_errno = errno;

       gotsig = 1;
       gotsig = 1;

-      write (sigpipe [1], &gotsig, 1);
+#ifdef WIN32
+      send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
+#else
+      write (sigpipe [1], &signum, 1);
+#endif
+      errno = old_errno;

     }
 }
 
     }
 }
 

+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 == default_loop));
+#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
 static void

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

 {
 {

-  struct ev_signal *w;
-  int sig;
+  int signum;

 
 

-  gotsig = 0;
+#ifdef WIN32
+  recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
+#else

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

+#endif
+  gotsig = 0;

 
 

-  for (sig = signalmax; sig--; )
-    if (signals [sig].gotsig)
-      {
-        signals [sig].gotsig = 0;
-
-        for (w = signals [sig].head; w; w = w->next)
-          event ((W)w, EV_SIGNAL);
-      }
+  for (signum = signalmax; signum--; )
+    if (signals [signum].gotsig)
+      ev_feed_signal_event (EV_A_ signum + 1);

 }
 
 static void
 }
 
 static void

-siginit (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);
   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

 
 

-  evio_set (&sigev, sigpipe [0], EV_READ);
-  evio_start (&sigev);
+  ev_io_set (&sigev, sigpipe [0], EV_READ);
+  ev_io_start (EV_A_ &sigev);
+  ev_unref (EV_A); /* child watcher should not keep loop alive */

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

-static struct ev_idle **idles;
-static int idlemax, idlecnt;
+static struct ev_child *childs [PID_HASHSIZE];
+
+#ifndef WIN32
+
+static struct ev_signal childev;

 
 

-static struct ev_prepare **prepares;
-static int preparemax, preparecnt;
+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
+
+static void
+child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
+{
+  struct ev_child *w;
+
+  for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
+    if (w->pid == pid || !w->pid)
+      {
+        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);
+      }
+}
+
+static void
+childcb (EV_P_ struct ev_signal *sw, int revents)
+{
+  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);
+
+      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 */
+    }
+}

 
 

-static struct ev_check **checks;
-static int checkmax, checkcnt;
+#endif

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

-#if HAVE_EPOLL
+#if EV_USE_KQUEUE
+# include "ev_kqueue.c"
+#endif
+#if EV_USE_EPOLL

 # include "ev_epoll.c"
 #endif
 # include "ev_epoll.c"
 #endif

-#if HAVE_SELECT
+#if EV_USE_POLL
+# include "ev_poll.c"
+#endif
+#if EV_USE_SELECT

 # include "ev_select.c"
 #endif
 
 # include "ev_select.c"
 #endif
 

-int ev_init (int flags)
+int
+ev_version_major (void)

 {
 {

-#if HAVE_MONOTONIC
-  {
-    struct timespec ts;
-    if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-      have_monotonic = 1;
-  }
+  return EV_VERSION_MAJOR;
+}
+
+int
+ev_version_minor (void)
+{
+  return EV_VERSION_MINOR;
+}
+
+/* return true if we are running with elevated privileges and should ignore env variables */
+static int
+enable_secure (void)
+{
+#ifdef WIN32
+  return 0;
+#else
+  return getuid () != geteuid ()
+      || getgid () != getegid ();

 #endif
 #endif

+}

 
 

-  ev_now = ev_time ();
-  now    = get_clock ();
-  diff   = ev_now - now;
+int
+ev_method (EV_P)
+{
+  return method;
+}

 
 

-  if (pipe (sigpipe))
-    return 0;
+static void
+loop_init (EV_P_ int methods)
+{
+  if (!method)
+    {
+#if EV_USE_MONOTONIC
+      {
+        struct timespec ts;
+        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          have_monotonic = 1;
+      }
+#endif
+
+      ev_rt_now = ev_time ();
+      mn_now    = get_clock ();
+      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;

 
 

-  ev_method = EVMETHOD_NONE;
-#if HAVE_EPOLL
-  if (ev_method == EVMETHOD_NONE) epoll_init (flags);
+      method = 0;
+#if EV_USE_WIN32
+      if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init  (EV_A_ methods);

 #endif
 #endif

-#if HAVE_SELECT
-  if (ev_method == EVMETHOD_NONE) select_init (flags);
+#if EV_USE_KQUEUE
+      if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
+#endif
+#if EV_USE_EPOLL
+      if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init  (EV_A_ methods);
+#endif
+#if EV_USE_POLL
+      if (!method && (methods & EVMETHOD_POLL  )) method = poll_init   (EV_A_ methods);
+#endif
+#if EV_USE_SELECT
+      if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);

 #endif
 
 #endif
 

-  if (ev_method)
-    {
-      evw_init (&sigev, sigcb);
-      siginit ();
+      ev_init (&sigev, sigcb);
+      ev_set_priority (&sigev, EV_MAXPRI);

     }
     }

-
-  return ev_method;

 }
 
 }
 

-/*****************************************************************************/
+void
+loop_destroy (EV_P)
+{
+  int i;
+
+#if EV_USE_WIN32
+  if (method == EVMETHOD_WIN32 ) win32_destroy  (EV_A);
+#endif
+#if EV_USE_KQUEUE
+  if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
+#endif
+#if EV_USE_EPOLL
+  if (method == EVMETHOD_EPOLL ) epoll_destroy  (EV_A);
+#endif
+#if EV_USE_POLL
+  if (method == EVMETHOD_POLL  ) poll_destroy   (EV_A);
+#endif
+#if EV_USE_SELECT
+  if (method == EVMETHOD_SELECT) select_destroy (EV_A);
+#endif

 
 

-void ev_prefork (void)
+  for (i = NUMPRI; i--; )
+    array_free (pending, [i]);
+
+  /* have to use the microsoft-never-gets-it-right macro */
+  array_free_microshit (fdchange);
+  array_free_microshit (timer);
+  array_free_microshit (periodic);
+  array_free_microshit (idle);
+  array_free_microshit (prepare);
+  array_free_microshit (check);
+
+  method = 0;
+}
+
+static void
+loop_fork (EV_P)

 {
 {

-  /* nop */
+#if EV_USE_EPOLL
+  if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
+#endif
+#if EV_USE_KQUEUE
+  if (method == EVMETHOD_KQUEUE) kqueue_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;

 }
 
 }
 

-void ev_postfork_parent (void)
+#if EV_MULTIPLICITY
+struct ev_loop *
+ev_loop_new (int methods)

 {
 {

-  /* nop */
+  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);
+
+  if (ev_method (EV_A))
+    return loop;
+
+  return 0;

 }
 
 }
 

-void ev_postfork_child (void)
+void
+ev_loop_destroy (EV_P)

 {
 {

-#if HAVE_EPOLL
-  if (ev_method == EVMETHOD_EPOLL)
-    epoll_postfork_child ();
-#endif
+  loop_destroy (EV_A);
+  ev_free (loop);
+}

 
 

-  evio_stop (&sigev);
-  close (sigpipe [0]);
-  close (sigpipe [1]);
-  pipe (sigpipe);
-  siginit ();
+void
+ev_loop_fork (EV_P)
+{
+  postfork = 1;

 }
 
 }
 

-/*****************************************************************************/
+#endif

 
 

-static void
-fd_reify (void)
+#if EV_MULTIPLICITY
+struct ev_loop *
+#else
+int
+#endif
+ev_default_loop (int methods)

 {
 {

-  int i;
+  if (sigpipe [0] == sigpipe [1])
+    if (pipe (sigpipe))
+      return 0;

 
 

-  for (i = 0; i < fdchangecnt; ++i)
+  if (!default_loop)

     {
     {

-      int fd = fdchanges [i];
-      ANFD *anfd = anfds + fd;
-      struct ev_io *w;
-
-      int wev = 0;
+#if EV_MULTIPLICITY
+      struct ev_loop *loop = default_loop = &default_loop_struct;
+#else
+      default_loop = 1;
+#endif

 
 

-      for (w = anfd->head; w; w = w->next)
-        wev |= w->events;
+      loop_init (EV_A_ methods);

 
 

-      if (anfd->wev != wev)
+      if (ev_method (EV_A))

         {
         {

-          method_modify (fd, anfd->wev, wev);
-          anfd->wev = wev;
+          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
+        default_loop = 0;

     }
 
     }
 

-  fdchangecnt = 0;
+  return default_loop;
+}
+
+void
+ev_default_destroy (void)
+{
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#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
+ev_default_fork (void)
+{
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#endif
+
+  if (method)
+    postfork = 1;
+}
+
+/*****************************************************************************/
+
+static int
+any_pending (EV_P)
+{
+  int pri;
+
+  for (pri = NUMPRI; pri--; )
+    if (pendingcnt [pri])
+      return 1;
+
+  return 0;

 }
 
 static void
 }
 
 static void

-call_pending ()
+call_pending (EV_P)

 {
 {

-  while (pendingcnt)
-    {
-      ANPENDING *p = pendings + --pendingcnt;
+  int pri;

 
 

-      if (p->w)
-        {
-          p->w->pending = 0;
-          p->w->cb (p->w, p->events);
-        }
-    }
+  for (pri = NUMPRI; pri--; )
+    while (pendingcnt [pri])
+      {
+        ANPENDING *p = pendings [pri] + --pendingcnt [pri];
+
+        if (p->w)
+          {
+            p->w->pending = 0;
+            EV_CB_INVOKE (p->w, p->events);
+          }
+      }

 }
 
 static void
 }
 
 static void

-timers_reify ()
+timers_reify (EV_P)

 {
 {

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

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

-      event ((W)w, EV_TIMEOUT);
+      assert (("inactive timer on timer heap detected", ev_is_active (w)));

 
       /* first reschedule or stop timer */
       if (w->repeat)
         {
 
       /* first reschedule or stop timer */
       if (w->repeat)
         {

-          w->at = now + w->repeat;
-          assert (("timer timeout in the past, negative repeat?", w->at > now));
+          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
+          ((WT)w)->at = mn_now + w->repeat;

           downheap ((WT *)timers, timercnt, 0);
         }
       else
           downheap ((WT *)timers, timercnt, 0);
         }
       else

-        evtimer_stop (w); /* nonrepeating: stop timer */
+        ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
+
+      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);

     }
 }
 
 static void
     }
 }
 
 static void

-periodics_reify ()
+periodics_reify (EV_P)

 {
 {

-  while (periodiccnt && periodics [0]->at <= ev_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)
+        {
+          ev_tstamp at = ((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)

         {
         {

-          w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
-          assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
+          ((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
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else

-        evperiodic_stop (w); /* nonrepeating: stop timer */
+        ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */

 
 

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

     }
 }
 
 static void
     }
 }
 
 static void

-periodics_reschedule (ev_tstamp diff)
+periodics_reschedule (EV_P)

 {
   int i;
 
 {
   int i;
 


@@ -496,85 +1039,131 @@ periodics_reschedule (ev_tstamp diff)
     {
       struct ev_periodic *w = periodics [i];
 
     {
       struct ev_periodic *w = periodics [i];
 

-      if (w->interval)
-        {
-          ev_tstamp diff = ceil ((ev_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)
+        ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
+    }

 
 

-          if (fabs (diff) >= 1e-4)
-            {
-              evperiodic_stop (w);
-              evperiodic_start (w);
+  /* now rebuild the heap */
+  for (i = periodiccnt >> 1; i--; )
+    downheap ((WT *)periodics, periodiccnt, i);
+}

 
 

-              i = 0; /* restart loop, inefficient, but time jumps should be rare */
-            }
-        }
+inline int
+time_update_monotonic (EV_P)
+{
+  mn_now = get_clock ();
+
+  if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
+    {
+      ev_rt_now = rtmn_diff + mn_now;
+      return 0;
+    }
+  else
+    {
+      now_floor = mn_now;
+      ev_rt_now = ev_time ();
+      return 1;

     }
 }
 
 static void
     }
 }
 
 static void

-time_update ()
+time_update (EV_P)

 {
   int i;
 
 {
   int i;
 

-  ev_now = ev_time ();
-
-  if (have_monotonic)
+#if EV_USE_MONOTONIC
+  if (expect_true (have_monotonic))

     {
     {

-      ev_tstamp odiff = diff;
-
-      for (i = 4; --i; ) /* loop a few times, before making important decisions */
+      if (time_update_monotonic (EV_A))

         {
         {

-          now = get_clock ();
-          diff = ev_now - now;
+          ev_tstamp odiff = rtmn_diff;

 
 

-          if (fabs (odiff - diff) < MIN_TIMEJUMP)
-            return; /* all is well */
+          for (i = 4; --i; ) /* loop a few times, before making important decisions */
+            {
+              rtmn_diff = ev_rt_now - mn_now;

 
 

-          ev_now = ev_time ();
-        }
+              if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
+                return; /* all is well */

 
 

-      periodics_reschedule (diff - odiff);
-      /* no timer adjustment, as the monotonic clock doesn't jump */
+              ev_rt_now = ev_time ();
+              mn_now    = get_clock ();
+              now_floor = mn_now;
+            }
+
+          periodics_reschedule (EV_A);
+          /* no timer adjustment, as the monotonic clock doesn't jump */
+          /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
+        }

     }
   else
     }
   else

+#endif

     {
     {

-      if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
+      ev_rt_now = ev_time ();
+
+      if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))

         {
         {

-          periodics_reschedule (ev_now - now);
+          periodics_reschedule (EV_A);

 
           /* 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 += diff;
+            ((WT)timers [i])->at += ev_rt_now - mn_now;

         }
 
         }
 

-      now = ev_now;
+      mn_now = ev_rt_now;

     }
 }
 
     }
 }
 

-int ev_loop_done;
+void
+ev_ref (EV_P)
+{
+  ++activecnt;
+}

 
 

-void ev_loop (int flags)
+void
+ev_unref (EV_P)
+{
+  --activecnt;
+}
+
+static int loop_done;
+
+void
+ev_loop (EV_P_ int flags)

 {
   double block;
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
+  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;

 
   do
     {
       /* queue check watchers (and execute them) */
 
   do
     {
       /* queue check watchers (and execute them) */

-      if (preparecnt)
+      if (expect_false (preparecnt))

         {
         {

-          queue_events ((W *)prepares, preparecnt, EV_PREPARE);
-          call_pending ();
+          queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
+          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 */
       /* update fd-related kernel structures */

-      fd_reify ();
+      fd_reify (EV_A);

 
       /* calculate blocking time */
 
 
       /* 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 */
          always have timers, we just calculate it always */

-      ev_now = ev_time ();
+#if EV_USE_MONOTONIC
+      if (expect_true (have_monotonic))
+        time_update_monotonic (EV_A);
+      else
+#endif
+        {
+          ev_rt_now = ev_time ();
+          mn_now    = ev_rt_now;
+        }

 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;


@@ -584,54 +1173,60 @@ void ev_loop (int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

-              ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
+              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;

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

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

               if (block > to) block = to;
             }
 
           if (block < 0.) block = 0.;
         }
 
               if (block > to) block = to;
             }
 
           if (block < 0.) block = 0.;
         }
 

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

 
 

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

 
       /* queue pending timers and reschedule them */
 
       /* queue pending timers and reschedule them */

-      timers_reify (); /* relative timers called last */
-      periodics_reify (); /* absolute timers called first */
+      timers_reify (EV_A); /* relative timers called last */
+      periodics_reify (EV_A); /* absolute timers called first */

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

-      if (!pendingcnt)
-        queue_events ((W *)idles, idlecnt, EV_IDLE);
+      if (idlecnt && !any_pending (EV_A))
+        queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);

 
       /* queue check watchers, to be executed first */
       if (checkcnt)
 
       /* queue check watchers, to be executed first */
       if (checkcnt)

-        queue_events ((W *)checks, checkcnt, EV_CHECK);
+        queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);

 
 

-      call_pending ();
+      call_pending (EV_A);

     }
     }

-  while (!ev_loop_done);
+  while (activecnt && !loop_done);

 
 

-  if (ev_loop_done != 2)
-    ev_loop_done = 0;
+  if (loop_done != 2)
+    loop_done = 0;
+}
+
+void
+ev_unloop (EV_P_ int how)
+{
+  loop_done = how;

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

-static void
+inline void

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

-static void
+inline void

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


@@ -646,239 +1241,303 @@ wlist_del (WL *head, WL elem)
     }
 }
 
     }
 }
 

-static void
-ev_clear (W w)
+inline void
+ev_clear_pending (EV_P_ W w)

 {
   if (w->pending)
     {
 {
   if (w->pending)
     {

-      pendings [w->pending - 1].w = 0;
+      pendings [ABSPRI (w)][w->pending - 1].w = 0;

       w->pending = 0;
     }
 }
 
       w->pending = 0;
     }
 }
 

-static void
-ev_start (W w, int active)
+inline void
+ev_start (EV_P_ W w, int active)

 {
 {

+  if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
+  if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
+

   w->active = active;
   w->active = active;

+  ev_ref (EV_A);

 }
 
 }
 

-static void
-ev_stop (W w)
+inline void
+ev_stop (EV_P_ W w)

 {
 {

+  ev_unref (EV_A);

   w->active = 0;
 }
 
 /*****************************************************************************/
 
 void
   w->active = 0;
 }
 
 /*****************************************************************************/
 
 void

-evio_start (struct ev_io *w)
+ev_io_start (EV_P_ struct ev_io *w)

 {
 {

+  int fd = w->fd;
+

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  int fd = w->fd;
+  assert (("ev_io_start called with negative fd", fd >= 0));

 
 

-  ev_start ((W)w, 1);
-  array_needsize (anfds, anfdmax, fd + 1, anfds_init);
+  ev_start (EV_A_ (W)w, 1);
+  array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);

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

-  ++fdchangecnt;
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
-  fdchanges [fdchangecnt - 1] = fd;
+  fd_change (EV_A_ fd);

 }
 
 void
 }
 
 void

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

 {
 {

-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     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);
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);

-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);

 
 

-  ++fdchangecnt;
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
-  fdchanges [fdchangecnt - 1] = w->fd;
+  fd_change (EV_A_ w->fd);

 }
 
 void
 }
 
 void

-evtimer_start (struct ev_timer *w)
+ev_timer_start (EV_P_ struct ev_timer *w)

 {
   if (ev_is_active (w))
     return;
 
 {
   if (ev_is_active (w))
     return;
 

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

 
 

-  assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
+  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));

 
 

-  ev_start ((W)w, ++timercnt);
-  array_needsize (timers, timermax, timercnt, );
+  ev_start (EV_A_ (W)w, ++timercnt);
+  array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));

   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
 }
 
 void

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

 {
 {

-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

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

     {
     {

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

     }
 
     }
 

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

 
 

-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);

 }
 
 void
 }
 
 void

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

 {
   if (ev_is_active (w))
     {
       if (w->repeat)
 {
   if (ev_is_active (w))
     {
       if (w->repeat)

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

       else
       else

-        evtimer_stop (w);
+        ev_timer_stop (EV_A_ w);

     }
   else if (w->repeat)
     }
   else if (w->repeat)

-    evtimer_start (w);
+    ev_timer_start (EV_A_ w);

 }
 
 void
 }
 
 void

-evperiodic_start (struct ev_periodic *w)
+ev_periodic_start (EV_P_ struct ev_periodic *w)

 {
   if (ev_is_active (w))
     return;
 
 {
   if (ev_is_active (w))
     return;
 

-  assert (("periodic interval value less than zero not allowed", 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 ((ev_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 ((W)w, ++periodiccnt);
-  array_needsize (periodics, periodicmax, periodiccnt, );
+  ev_start (EV_A_ (W)w, ++periodiccnt);
+  array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));

   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
 }
 
 void

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

 {
 {

-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

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

     {
     {

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

     }
 
     }
 

-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
+}
+
+void
+ev_periodic_again (EV_P_ struct ev_periodic *w)
+{
+  /* TODO: use adjustheap and recalculation */
+  ev_periodic_stop (EV_A_ w);
+  ev_periodic_start (EV_A_ w);

 }
 
 void
 }
 
 void

-evsignal_start (struct ev_signal *w)
+ev_idle_start (EV_P_ struct ev_idle *w)

 {
   if (ev_is_active (w))
     return;
 
 {
   if (ev_is_active (w))
     return;
 

-  ev_start ((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 = 0;
-      sigaction (w->signum, &sa, 0);
-    }
+  ev_start (EV_A_ (W)w, ++idlecnt);
+  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
+  idles [idlecnt - 1] = w;

 }
 
 void
 }
 
 void

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

 {
 {

-  ev_clear ((W)w);
-  if (!ev_is_active (w))
+  ev_clear_pending (EV_A_ (W)w);
+  if (ev_is_active (w))

     return;
 
     return;
 

-  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
-  ev_stop ((W)w);
+  idles [((W)w)->active - 1] = idles [--idlecnt];
+  ev_stop (EV_A_ (W)w);
+}

 
 

-  if (!signals [w->signum - 1].head)
-    signal (w->signum, SIG_DFL);
+void
+ev_prepare_start (EV_P_ struct ev_prepare *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start (EV_A_ (W)w, ++preparecnt);
+  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
+  prepares [preparecnt - 1] = w;

 }
 
 }
 

-void evidle_start (struct ev_idle *w)
+void
+ev_prepare_stop (EV_P_ struct ev_prepare *w)

 {
 {

+  ev_clear_pending (EV_A_ (W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  ev_start ((W)w, ++idlecnt);
-  array_needsize (idles, idlemax, idlecnt, );
-  idles [idlecnt - 1] = w;
+  prepares [((W)w)->active - 1] = prepares [--preparecnt];
+  ev_stop (EV_A_ (W)w);

 }
 
 }
 

-void evidle_stop (struct ev_idle *w)
+void
+ev_check_start (EV_P_ struct ev_check *w)

 {
 {

-  ev_clear ((W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  idles [w->active - 1] = idles [--idlecnt];
-  ev_stop ((W)w);
+  ev_start (EV_A_ (W)w, ++checkcnt);
+  array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
+  checks [checkcnt - 1] = w;

 }
 
 }
 

-void evprepare_start (struct ev_prepare *w)
+void
+ev_check_stop (EV_P_ struct ev_check *w)

 {
 {

+  ev_clear_pending (EV_A_ (W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  ev_start ((W)w, ++preparecnt);
-  array_needsize (prepares, preparemax, preparecnt, );
-  prepares [preparecnt - 1] = w;
+  checks [((W)w)->active - 1] = checks [--checkcnt];
+  ev_stop (EV_A_ (W)w);

 }
 
 }
 

-void evprepare_stop (struct ev_prepare *w)
+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+
+void
+ev_signal_start (EV_P_ struct ev_signal *w)

 {
 {

-  ev_clear ((W)w);
+#if EV_MULTIPLICITY
+  assert (("signal watchers are only supported in the default loop", loop == default_loop));
+#endif

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  prepares [w->active - 1] = prepares [--preparecnt];
-  ev_stop ((W)w);
+  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 evcheck_start (struct ev_check *w)
+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);
+}
+
+void
+ev_child_start (EV_P_ struct ev_child *w)
+{
+#if EV_MULTIPLICITY
+  assert (("child watchers are only supported in the default loop", loop == default_loop));
+#endif

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  ev_start ((W)w, ++checkcnt);
-  array_needsize (checks, checkmax, checkcnt, );
-  checks [checkcnt - 1] = w;
+  ev_start (EV_A_ (W)w, 1);
+  wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);

 }
 
 }
 

-void evcheck_stop (struct ev_check *w)
+void
+ev_child_stop (EV_P_ struct ev_child *w)

 {
 {

-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  checks [w->active - 1] = checks [--checkcnt];
-  ev_stop ((W)w);
+  wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  ev_stop (EV_A_ (W)w);

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


@@ -892,140 +1551,59 @@ struct ev_once
 };
 
 static void
 };
 
 static void

-once_cb (struct ev_once *once, int revents)
+once_cb (EV_P_ struct ev_once *once, int revents)

 {
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 
 {
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 

-  evio_stop (&once->io);
-  evtimer_stop (&once->to);
-  free (once);
+  ev_io_stop (EV_A_ &once->io);
+  ev_timer_stop (EV_A_ &once->to);
+  ev_free (once);

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

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

 {
 {

-  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+  once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);

 }
 
 static void
 }
 
 static void

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

 {
 {

-  once_cb ((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);

 }
 
 void
 }
 
 void

-ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
+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)
 
   if (!once)

-    cb (EV_ERROR, arg);
+    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);

   else
     {
       once->cb  = cb;
       once->arg = arg;
 
   else
     {
       once->cb  = cb;
       once->arg = arg;
 

-      evw_init (&once->io, once_cb_io);
-
+      ev_init (&once->io, once_cb_io);

       if (fd >= 0)
         {
       if (fd >= 0)
         {

-          evio_set (&once->io, fd, events);
-          evio_start (&once->io);
+          ev_io_set (&once->io, fd, events);
+          ev_io_start (EV_A_ &once->io);

         }
 
         }
 

-      evw_init (&once->to, once_cb_to);
-
+      ev_init (&once->to, once_cb_to);

       if (timeout >= 0.)
         {
       if (timeout >= 0.)
         {

-          evtimer_set (&once->to, timeout, 0.);
-          evtimer_start (&once->to);
+          ev_timer_set (&once->to, timeout, 0.);
+          ev_timer_start (EV_A_ &once->to);

         }
     }
 }
 
         }
     }
 }
 

-/*****************************************************************************/
-
-#if 0
-
-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);
-  evtimer_stop (w);
-  evtimer_start (w);
-}
-
-static void
-scb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "signal %x,%d\n", revents, w->signum);
-  evio_stop (&wio);
-  evio_start (&wio);
-}
-
-static void
-gcb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "generic %x\n", revents);
-
+#ifdef __cplusplus

 }
 }

-
-int main (void)
-{
-  ev_init (0);
-
-  evio_init (&wio, sin_cb, 0, EV_READ);
-  evio_start (&wio);
-
-  struct ev_timer t[10000];
-
-#if 0
-  int i;
-  for (i = 0; i < 10000; ++i)
-    {
-      struct ev_timer *w = t + i;
-      evw_init (w, ocb, i);
-      evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
-      evtimer_start (w);
-      if (drand48 () < 0.5)
-        evtimer_stop (w);
-    }

 #endif
 
 #endif
 

-  struct ev_timer t1;
-  evtimer_init (&t1, ocb, 5, 10);
-  evtimer_start (&t1);
-
-  struct ev_signal sig;
-  evsignal_init (&sig, scb, SIGQUIT);
-  evsignal_start (&sig);
-
-  struct ev_check cw;
-  evcheck_init (&cw, gcb);
-  evcheck_start (&cw);
-
-  struct ev_idle iw;
-  evidle_init (&iw, gcb);
-  evidle_start (&iw);
-
-  ev_loop (0);
-
-  return 0;
-}
-
-#endif
-
-
-
-