*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 35180023c603d60532c1f2008223a822a8ecdc47..14213df8f039858fdcd18a9e79d0ff779d127b70 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -56,6 +56,14 @@ extern "C" {
 #  endif
 # endif
 
 #  endif
 # endif
 

+# ifndef EV_USE_NANOSLEEP
+#  if HAVE_NANOSLEEP
+#   define EV_USE_NANOSLEEP 1
+#  else
+#   define EV_USE_NANOSLEEP 0
+#  endif
+# endif
+

 # ifndef EV_USE_SELECT
 #  if HAVE_SELECT && HAVE_SYS_SELECT_H
 #   define EV_USE_SELECT 1
 # ifndef EV_USE_SELECT
 #  if HAVE_SELECT && HAVE_SYS_SELECT_H
 #   define EV_USE_SELECT 1


@@ -148,6 +156,10 @@ extern "C" {
 # define EV_USE_REALTIME 0
 #endif
 
 # define EV_USE_REALTIME 0
 #endif
 

+#ifndef EV_USE_NANOSLEEP
+# define EV_USE_NANOSLEEP 0
+#endif
+

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


@@ -204,48 +216,66 @@ extern "C" {
 # define EV_USE_REALTIME 0
 #endif
 
 # define EV_USE_REALTIME 0
 #endif
 

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

 #if !EV_STAT_ENABLE
 #if !EV_STAT_ENABLE

+# undef EV_USE_INOTIFY

 # define EV_USE_INOTIFY 0
 #endif
 
 # define EV_USE_INOTIFY 0
 #endif
 

+#if !EV_USE_NANOSLEEP
+# ifndef _WIN32
+#  include <sys/select.h>
+# endif
+#endif
+

 #if EV_USE_INOTIFY
 # include <sys/inotify.h>
 #endif
 
 #if EV_USE_INOTIFY
 # include <sys/inotify.h>
 #endif
 

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

 /**/
 
 /**/
 

+/*
+ * This is used to avoid floating point rounding problems.
+ * It is added to ev_rt_now when scheduling periodics
+ * to ensure progress, time-wise, even when rounding
+ * errors are against us.
+ * This value is good at least till the year 4000.
+ * Better solutions welcome.
+ */
+#define TIME_EPSILON  0.0001220703125 /* 1/8192 */
+

 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */

-/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* 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, TODO */

 
 

-#if __GNUC__ >= 3
+#if __GNUC__ >= 4

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

-# define inline_size                static inline /* inline for codesize */
-# if EV_MINIMAL
-#  define noinline                  __attribute__ ((noinline))
-#  define inline_speed              static noinline
-# else
-#  define noinline
-#  define inline_speed              static inline
-# endif
+# define noinline                   __attribute__ ((noinline))

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

-# define inline_speed               static
-# define inline_size                static

 # define noinline
 # define noinline

+# if __STDC_VERSION__ < 199901L
+#  define inline
+# endif

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

+#define inline_size        static inline
+
+#if EV_MINIMAL
+# define inline_speed      static noinline
+#else
+# define inline_speed      static inline
+#endif

 
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)

-#define ABSPRI(w) ((w)->priority - EV_MINPRI)
+#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)

 
 

-#define EMPTY0      /* required for microsofts broken pseudo-c compiler */
+#define EMPTY       /* required for microsofts broken pseudo-c compiler */

 #define EMPTY2(a,b) /* used to suppress some warnings */
 
 typedef ev_watcher *W;
 #define EMPTY2(a,b) /* used to suppress some warnings */
 
 typedef ev_watcher *W;


@@ -398,23 +428,71 @@ ev_now (EV_P)
 }
 #endif
 
 }
 #endif
 

-#define array_roundsize(type,n) (((n) | 4) & ~3)
+void
+ev_sleep (ev_tstamp delay)
+{
+  if (delay > 0.)
+    {
+#if EV_USE_NANOSLEEP
+      struct timespec ts;
+
+      ts.tv_sec  = (time_t)delay;
+      ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
+
+      nanosleep (&ts, 0);
+#elif defined(_WIN32)
+      Sleep (delay * 1e3);
+#else
+      struct timeval tv;
+
+      tv.tv_sec  = (time_t)delay;
+      tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
+
+      select (0, 0, 0, 0, &tv);
+#endif
+    }
+}
+
+/*****************************************************************************/
+
+int inline_size
+array_nextsize (int elem, int cur, int cnt)
+{
+  int ncur = cur + 1;
+
+  do
+    ncur <<= 1;
+  while (cnt > ncur);
+
+  /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
+  if (elem * ncur > 4096)
+    {
+      ncur *= elem;
+      ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
+      ncur = ncur - sizeof (void *) * 4;
+      ncur /= elem;
+    }
+
+  return ncur;
+}
+
+static noinline void *
+array_realloc (int elem, void *base, int *cur, int cnt)
+{
+  *cur = array_nextsize (elem, *cur, cnt);
+  return ev_realloc (base, elem * *cur);
+}

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

-  if (expect_false ((cnt) > cur))                              \
+  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;                                            \
+      int ocur_ = (cur);                                       \
+      (base) = (type *)array_realloc                           \
+         (sizeof (type), (base), &(cur), (cnt));               \
+      init ((base) + (ocur_), (cur) - ocur_);                  \

     }
 
     }
 

+#if 0

 #define array_slim(type,stem)                                  \
   if (stem ## max < array_roundsize (stem ## cnt >> 2))                \
     {                                                          \
 #define array_slim(type,stem)                                  \
   if (stem ## max < array_roundsize (stem ## cnt >> 2))                \
     {                                                          \


@@ -422,6 +500,7 @@ ev_now (EV_P)
       base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
       fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
     }
       base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
       fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
     }

+#endif

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


@@ -432,20 +511,20 @@ void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;

+  int pri = ABSPRI (w_);

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

+    pendings [pri][w_->pending - 1].events |= revents;
+  else

     {
     {

-      pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
-      return;
+      w_->pending = ++pendingcnt [pri];
+      array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
+      pendings [pri][w_->pending - 1].w      = w_;
+      pendings [pri][w_->pending - 1].events = revents;

     }
     }

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

 }
 
 }
 

-void inline_size
+void inline_speed

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


@@ -487,7 +566,8 @@ fd_event (EV_P_ int fd, int revents)
 void
 ev_feed_fd_event (EV_P_ int fd, int revents)
 {
 void
 ev_feed_fd_event (EV_P_ int fd, int revents)
 {

-  fd_event (EV_A_ fd, revents);
+  if (fd >= 0 && fd < anfdmax)
+    fd_event (EV_A_ fd, revents);

 }
 
 void inline_size
 }
 
 void inline_size


@@ -501,10 +581,10 @@ fd_reify (EV_P)
       ANFD *anfd = anfds + fd;
       ev_io *w;
 
       ANFD *anfd = anfds + fd;
       ev_io *w;
 

-      int events = 0;
+      unsigned char events = 0;

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

-        events |= w->events;
+        events |= (unsigned char)w->events;

 
 #if EV_SELECT_IS_WINSOCKET
       if (events)
 
 #if EV_SELECT_IS_WINSOCKET
       if (events)


@@ -515,26 +595,33 @@ fd_reify (EV_P)
         }
 #endif
 
         }
 #endif
 

-      anfd->reify = 0;
+      {
+        unsigned char o_events = anfd->events;
+        unsigned char o_reify  = anfd->reify;
+
+        anfd->reify  = 0;
+        anfd->events = events;

 
 

-      backend_modify (EV_A_ fd, anfd->events, events);
-      anfd->events = events;
+        if (o_events != events || o_reify & EV_IOFDSET)
+          backend_modify (EV_A_ fd, o_events, events);
+      }

     }
 
   fdchangecnt = 0;
 }
 
 void inline_size
     }
 
   fdchangecnt = 0;
 }
 
 void inline_size

-fd_change (EV_P_ int fd)
+fd_change (EV_P_ int fd, int flags)

 {
 {

-  if (expect_false (anfds [fd].reify))
-    return;
+  unsigned char reify = anfds [fd].reify;
+  anfds [fd].reify |= flags;

 
 

-  anfds [fd].reify = 1;
-
-  ++fdchangecnt;
-  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
-  fdchanges [fdchangecnt - 1] = fd;
+  if (expect_true (!reify))
+    {
+      ++fdchangecnt;
+      array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
+      fdchanges [fdchangecnt - 1] = fd;
+    }

 }
 
 void inline_speed
 }
 
 void inline_speed


@@ -595,7 +682,7 @@ fd_rearm_all (EV_P)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;

-        fd_change (EV_A_ fd);
+        fd_change (EV_A_ fd, EV_IOFDSET | 1);

       }
 }
 
       }
 }
 


@@ -606,16 +693,20 @@ upheap (WT *heap, int k)
 {
   WT w = heap [k];
 
 {
   WT w = heap [k];
 

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

     {
     {

-      heap [k] = heap [k >> 1];
+      int p = (k - 1) >> 1;
+
+      if (heap [p]->at <= w->at)
+        break;
+
+      heap [k] = heap [p];

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

-      k >>= 1;
+      k = p;

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

-

 }
 
 void inline_speed
 }
 
 void inline_speed


@@ -623,19 +714,23 @@ downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];
 
 {
   WT w = heap [k];
 

-  while (k < (N >> 1))
+  for (;;)

     {
     {

-      int j = k << 1;
+      int c = (k << 1) + 1;
+
+      if (c >= N)
+        break;

 
 

-      if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
-        ++j;
+      c += c + 1 < N && heap [c]->at > heap [c + 1]->at
+           ? 1 : 0;

 
 

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

         break;
 
         break;
 

-      heap [k] = heap [j];
+      heap [k] = heap [c];

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

-      k = j;
+
+      k = c;

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


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

-void inline_size
+void inline_speed

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


@@ -752,7 +847,7 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static ev_child *childs [EV_PID_HASHSIZE];
+static WL childs [EV_PID_HASHSIZE];

 
 #ifndef _WIN32
 
 
 #ifndef _WIN32
 


@@ -766,9 +861,9 @@ child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
   for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {
   for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {

-        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
-        w->rpid         = pid;
-        w->rstatus      = status;
+        ev_set_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);
       }
 }
         ev_feed_event (EV_A_ (W)w, EV_CHILD);
       }
 }


@@ -877,8 +972,8 @@ ev_recommended_backends (void)
 unsigned int
 ev_embeddable_backends (void)
 {
 unsigned int
 ev_embeddable_backends (void)
 {

-  return EVBACKEND_EPOLL
-       | EVBACKEND_KQUEUE
+  /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
+  return EVBACKEND_KQUEUE

        | EVBACKEND_PORT;
 }
 
        | EVBACKEND_PORT;
 }
 


@@ -888,6 +983,24 @@ ev_backend (EV_P)
   return backend;
 }
 
   return backend;
 }
 

+unsigned int
+ev_loop_count (EV_P)
+{
+  return loop_count;
+}
+
+void
+ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
+{
+  io_blocktime = interval;
+}
+
+void
+ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
+{
+  timeout_blocktime = interval;
+}
+

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


@@ -906,6 +1019,9 @@ loop_init (EV_P_ unsigned int flags)
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
 

+      io_blocktime      = 0.;
+      timeout_blocktime = 0.;
+

       /* pid check not overridable via env */
 #ifndef _WIN32
       if (flags & EVFLAG_FORKCHECK)
       /* pid check not overridable via env */
 #ifndef _WIN32
       if (flags & EVFLAG_FORKCHECK)


@@ -977,17 +1093,26 @@ loop_destroy (EV_P)
 #endif
 
   for (i = NUMPRI; i--; )
 #endif
 
   for (i = NUMPRI; i--; )

-    array_free (pending, [i]);
+    {
+      array_free (pending, [i]);
+#if EV_IDLE_ENABLE
+      array_free (idle, [i]);
+#endif
+    }
+
+  ev_free (anfds); anfdmax = 0;

 
   /* have to use the microsoft-never-gets-it-right macro */
 
   /* have to use the microsoft-never-gets-it-right macro */

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

 #if EV_PERIODIC_ENABLE
 #if EV_PERIODIC_ENABLE

-  array_free (periodic, EMPTY0);
+  array_free (periodic, EMPTY);
+#endif
+#if EV_FORK_ENABLE
+  array_free (fork, EMPTY);

 #endif
 #endif

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

 
   backend = 0;
 }
 
   backend = 0;
 }


@@ -1133,16 +1258,10 @@ ev_default_fork (void)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-int inline_size
-any_pending (EV_P)
+void
+ev_invoke (EV_P_ void *w, int revents)

 {
 {

-  int pri;
-
-  for (pri = NUMPRI; pri--; )
-    if (pendingcnt [pri])
-      return 1;
-
-  return 0;
+  EV_CB_INVOKE ((W)w, revents);

 }
 
 void inline_speed
 }
 
 void inline_speed


@@ -1170,7 +1289,7 @@ timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {

-      ev_timer *w = timers [0];
+      ev_timer *w = (ev_timer *)timers [0];

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


@@ -1183,7 +1302,7 @@ timers_reify (EV_P)
           if (((WT)w)->at < mn_now)
             ((WT)w)->at = mn_now;
 
           if (((WT)w)->at < mn_now)
             ((WT)w)->at = mn_now;
 

-          downheap ((WT *)timers, timercnt, 0);
+          downheap (timers, timercnt, 0);

         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */


@@ -1198,22 +1317,23 @@ periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {

-      ev_periodic *w = periodics [0];
+      ev_periodic *w = (ev_periodic *)periodics [0];

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

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

           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));

-          downheap ((WT *)periodics, periodiccnt, 0);
+          downheap (periodics, periodiccnt, 0);

         }
       else if (w->interval)
         {
         }
       else if (w->interval)
         {

-          ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+          if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;

           assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
           assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));

-          downheap ((WT *)periodics, periodiccnt, 0);
+          downheap (periodics, periodiccnt, 0);

         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */


@@ -1230,88 +1350,102 @@ periodics_reschedule (EV_P)
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {

-      ev_periodic *w = periodics [i];
+      ev_periodic *w = (ev_periodic *)periodics [i];

 
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
       else if (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;
+        ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;

     }
 
   /* now rebuild the heap */
   for (i = periodiccnt >> 1; i--; )
     }
 
   /* now rebuild the heap */
   for (i = periodiccnt >> 1; i--; )

-    downheap ((WT *)periodics, periodiccnt, i);
+    downheap (periodics, periodiccnt, i);

 }
 #endif
 
 }
 #endif
 

-int inline_size
-time_update_monotonic (EV_P)
+#if EV_IDLE_ENABLE
+void inline_size
+idle_reify (EV_P)

 {
 {

-  mn_now = get_clock ();
-
-  if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
+  if (expect_false (idleall))

     {
     {

-      ev_rt_now = rtmn_diff + mn_now;
-      return 0;
-    }
-  else
-    {
-      now_floor = mn_now;
-      ev_rt_now = ev_time ();
-      return 1;
+      int pri;
+
+      for (pri = NUMPRI; pri--; )
+        {
+          if (pendingcnt [pri])
+            break;
+
+          if (idlecnt [pri])
+            {
+              queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
+              break;
+            }
+        }

     }
 }
     }
 }

+#endif

 
 

-void inline_size
-time_update (EV_P)
+void inline_speed
+time_update (EV_P_ ev_tstamp max_block)

 {
   int i;
 
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
 {
   int i;
 
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {

-      if (time_update_monotonic (EV_A))
+      ev_tstamp odiff = rtmn_diff;
+
+      mn_now = get_clock ();
+
+      /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
+      /* interpolate in the meantime */
+      if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))

         {
         {

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

 
 

-              if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
-                return; /* all is well */
+      now_floor = mn_now;
+      ev_rt_now = ev_time ();

 
 

-              ev_rt_now = ev_time ();
-              mn_now    = get_clock ();
-              now_floor = mn_now;
-            }
+      /* loop a few times, before making important decisions.
+       * on the choice of "4": one iteration isn't enough,
+       * in case we get preempted during the calls to
+       * ev_time and get_clock. a second call is almost guaranteed
+       * to succeed in that case, though. and looping a few more times
+       * doesn't hurt either as we only do this on time-jumps or
+       * in the unlikely event of having been preempted here.
+       */
+      for (i = 4; --i; )
+        {
+          rtmn_diff = ev_rt_now - mn_now;
+
+          if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
+            return; /* all is well */
+
+          ev_rt_now = ev_time ();
+          mn_now    = get_clock ();
+          now_floor = mn_now;
+        }

 
 # if EV_PERIODIC_ENABLE
 
 # if EV_PERIODIC_ENABLE

-          periodics_reschedule (EV_A);
+      periodics_reschedule (EV_A);

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

     }
   else
 #endif
     {
       ev_rt_now = ev_time ();
 
     }
   else
 #endif
     {
       ev_rt_now = ev_time ();
 

-      if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
+      if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))

         {
 #if EV_PERIODIC_ENABLE
           periodics_reschedule (EV_A);
 #endif
         {
 #if EV_PERIODIC_ENABLE
           periodics_reschedule (EV_A);
 #endif

-

           /* adjust timers. this is easy, as the offset is the same for all of them */
           for (i = 0; i < timercnt; ++i)
             ((WT)timers [i])->at += ev_rt_now - mn_now;
           /* adjust timers. this is easy, as the offset is the same for all of them */
           for (i = 0; i < timercnt; ++i)
             ((WT)timers [i])->at += ev_rt_now - mn_now;


@@ -1344,7 +1478,7 @@ ev_loop (EV_P_ int flags)
 
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
 
 
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
 

-  while (activecnt)
+  do

     {
 #ifndef _WIN32
       if (expect_false (curpid)) /* penalise the forking check even more */
     {
 #ifndef _WIN32
       if (expect_false (curpid)) /* penalise the forking check even more */


@@ -1365,13 +1499,16 @@ ev_loop (EV_P_ int flags)
           }
 #endif
 
           }
 #endif
 

-      /* queue check watchers (and execute them) */
+      /* queue prepare watchers (and execute them) */

       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
         }
 
       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
         }
 

+      if (expect_false (!activecnt))
+        break;
+

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


@@ -1381,47 +1518,51 @@ ev_loop (EV_P_ int flags)
 
       /* calculate blocking time */
       {
 
       /* calculate blocking time */
       {

-        ev_tstamp block;
+        ev_tstamp waittime  = 0.;
+        ev_tstamp sleeptime = 0.;

 
 

-        if (flags & EVLOOP_NONBLOCK || idlecnt)
-          block = 0.; /* do not block at all */
-        else
+        if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))

           {
             /* update time to cancel out callback processing overhead */
           {
             /* update time to cancel out callback processing overhead */

-#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;
-              }
+            time_update (EV_A_ 1e100);

 
 

-            block = MAX_BLOCKTIME;
+            waittime = MAX_BLOCKTIME;

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

-                if (block > to) block = to;
+                if (waittime > to) waittime = to;

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

-                if (block > to) block = to;
+                if (waittime > to) waittime = to;

               }
 #endif
 
               }
 #endif
 

-            if (expect_false (block < 0.)) block = 0.;
+            if (expect_false (waittime < timeout_blocktime))
+              waittime = timeout_blocktime;
+
+            sleeptime = waittime - backend_fudge;
+
+            if (expect_true (sleeptime > io_blocktime))
+              sleeptime = io_blocktime;
+
+            if (sleeptime)
+              {
+                ev_sleep (sleeptime);
+                waittime -= sleeptime;
+              }

           }
 
           }
 

-        backend_poll (EV_A_ block);
-      }
+        ++loop_count;
+        backend_poll (EV_A_ waittime);

 
 

-      /* update ev_rt_now, do magic */
-      time_update (EV_A);
+        /* update ev_rt_now, do magic */
+        time_update (EV_A_ waittime + sleeptime);
+      }

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


@@ -1429,9 +1570,10 @@ ev_loop (EV_P_ int flags)
       periodics_reify (EV_A); /* absolute timers called first */
 #endif
 
       periodics_reify (EV_A); /* absolute timers called first */
 #endif
 

+#if EV_IDLE_ENABLE

       /* queue idle watchers unless other events are pending */
       /* queue idle watchers unless other events are pending */

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

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


@@ -1439,9 +1581,8 @@ ev_loop (EV_P_ int flags)
 
       call_pending (EV_A);
 
 
       call_pending (EV_A);
 

-      if (expect_false (loop_done))
-        break;

     }
     }

+  while (expect_true (activecnt && !loop_done));

 
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;
 
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;


@@ -1478,7 +1619,7 @@ wlist_del (WL *head, WL elem)
 }
 
 void inline_speed
 }
 
 void inline_speed

-ev_clear_pending (EV_P_ W w)
+clear_pending (EV_P_ W w)

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


@@ -1487,12 +1628,36 @@ ev_clear_pending (EV_P_ W w)
     }
 }
 
     }
 }
 

+int
+ev_clear_pending (EV_P_ void *w)
+{
+  W w_ = (W)w;
+  int pending = w_->pending;
+
+  if (expect_true (pending))
+    {
+      ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
+      w_->pending = 0;
+      p->w = 0;
+      return p->events;
+    }
+  else
+    return 0;
+}
+
+void inline_size
+pri_adjust (EV_P_ W w)
+{
+  int pri = w->priority;
+  pri = pri < EV_MINPRI ? EV_MINPRI : pri;
+  pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
+  w->priority = pri;
+}
+

 void inline_speed
 ev_start (EV_P_ W w, int active)
 {
 void inline_speed
 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;
-
+  pri_adjust (EV_A_ w);

   w->active = active;
   ev_ref (EV_A);
 }
   w->active = active;
   ev_ref (EV_A);
 }


@@ -1506,7 +1671,7 @@ ev_stop (EV_P_ W w)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-void
+void noinline

 ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;
 ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;


@@ -1518,27 +1683,28 @@ ev_io_start (EV_P_ ev_io *w)
 
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, 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 (&anfds[fd].head, (WL)w);

 
 

-  fd_change (EV_A_ fd);
+  fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
+  w->events &= ~EV_IOFDSET;

 }
 
 }
 

-void
+void noinline

 ev_io_stop (EV_P_ ev_io *w)
 {
 ev_io_stop (EV_P_ ev_io *w)
 {

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

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

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

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

-  fd_change (EV_A_ w->fd);
+  fd_change (EV_A_ w->fd, 1);

 }
 
 }
 

-void
+void noinline

 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))
 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))


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

-  array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
-  timers [timercnt - 1] = w;
-  upheap ((WT *)timers, timercnt - 1);
+  array_needsize (WT, timers, timermax, timercnt, EMPTY2);
+  timers [timercnt - 1] = (WT)w;
+  upheap (timers, timercnt - 1);

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

-void
+void noinline

 ev_timer_stop (EV_P_ ev_timer *w)
 {
 ev_timer_stop (EV_P_ ev_timer *w)
 {

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

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

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

 
   {
     int active = ((W)w)->active;
 
   {
     int active = ((W)w)->active;


@@ -1571,7 +1737,7 @@ ev_timer_stop (EV_P_ ev_timer *w)
     if (expect_true (--active < --timercnt))
       {
         timers [active] = timers [timercnt];
     if (expect_true (--active < --timercnt))
       {
         timers [active] = timers [timercnt];

-        adjustheap ((WT *)timers, timercnt, active);
+        adjustheap (timers, timercnt, active);

       }
   }
 
       }
   }
 


@@ -1580,7 +1746,7 @@ ev_timer_stop (EV_P_ ev_timer *w)
   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 

-void
+void noinline

 ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))
 ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))


@@ -1588,7 +1754,7 @@ ev_timer_again (EV_P_ ev_timer *w)
       if (w->repeat)
         {
           ((WT)w)->at = mn_now + w->repeat;
       if (w->repeat)
         {
           ((WT)w)->at = mn_now + w->repeat;

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

         }
       else
         ev_timer_stop (EV_A_ w);
         }
       else
         ev_timer_stop (EV_A_ w);


@@ -1601,7 +1767,7 @@ ev_timer_again (EV_P_ ev_timer *w)
 }
 
 #if EV_PERIODIC_ENABLE
 }
 
 #if EV_PERIODIC_ENABLE

-void
+void noinline

 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))
 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))


@@ -1613,25 +1779,27 @@ ev_periodic_start (EV_P_ ev_periodic *w)
     {
       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 */
     {
       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;
+      ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;

     }
     }

+  else
+    ((WT)w)->at = w->offset;

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

-  array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
-  periodics [periodiccnt - 1] = w;
-  upheap ((WT *)periodics, periodiccnt - 1);
+  array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
+  periodics [periodiccnt - 1] = (WT)w;
+  upheap (periodics, periodiccnt - 1);

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

-void
+void noinline

 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
 ev_periodic_stop (EV_P_ ev_periodic *w)
 {

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

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

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

 
   {
     int active = ((W)w)->active;
 
   {
     int active = ((W)w)->active;


@@ -1639,14 +1807,14 @@ ev_periodic_stop (EV_P_ ev_periodic *w)
     if (expect_true (--active < --periodiccnt))
       {
         periodics [active] = periodics [periodiccnt];
     if (expect_true (--active < --periodiccnt))
       {
         periodics [active] = periodics [periodiccnt];

-        adjustheap ((WT *)periodics, periodiccnt, active);
+        adjustheap (periodics, periodiccnt, active);

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

-void
+void noinline

 ev_periodic_again (EV_P_ ev_periodic *w)
 {
   /* TODO: use adjustheap and recalculation */
 ev_periodic_again (EV_P_ ev_periodic *w)
 {
   /* TODO: use adjustheap and recalculation */


@@ -1659,7 +1827,7 @@ ev_periodic_again (EV_P_ ev_periodic *w)
 # define SA_RESTART 0
 #endif
 
 # define SA_RESTART 0
 #endif
 

-void
+void noinline

 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY
 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY


@@ -1670,9 +1838,22 @@ ev_signal_start (EV_P_ ev_signal *w)
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 

+  {
+#ifndef _WIN32
+    sigset_t full, prev;
+    sigfillset (&full);
+    sigprocmask (SIG_SETMASK, &full, &prev);
+#endif
+
+    array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+
+#ifndef _WIN32
+    sigprocmask (SIG_SETMASK, &prev, 0);
+#endif
+  }
+

   ev_start (EV_A_ (W)w, 1);
   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);
+  wlist_add (&signals [w->signum - 1].head, (WL)w);

 
   if (!((WL)w)->next)
     {
 
   if (!((WL)w)->next)
     {


@@ -1688,14 +1869,14 @@ ev_signal_start (EV_P_ ev_signal *w)
     }
 }
 
     }
 }
 

-void
+void noinline

 ev_signal_stop (EV_P_ ev_signal *w)
 {
 ev_signal_stop (EV_P_ ev_signal *w)
 {

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

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

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

   ev_stop (EV_A_ (W)w);
 
   if (!signals [w->signum - 1].head)
   ev_stop (EV_A_ (W)w);
 
   if (!signals [w->signum - 1].head)


@@ -1712,17 +1893,17 @@ ev_child_start (EV_P_ ev_child *w)
     return;
 
   ev_start (EV_A_ (W)w, 1);
     return;
 
   ev_start (EV_A_ (W)w, 1);

-  wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);

 }
 
 void
 ev_child_stop (EV_P_ ev_child *w)
 {
 }
 
 void
 ev_child_stop (EV_P_ ev_child *w)
 {

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

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

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

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


@@ -1964,7 +2145,7 @@ ev_stat_start (EV_P_ ev_stat *w)
 void
 ev_stat_stop (EV_P_ ev_stat *w)
 {
 void
 ev_stat_stop (EV_P_ ev_stat *w)
 {

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

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


@@ -1977,32 +2158,44 @@ ev_stat_stop (EV_P_ ev_stat *w)
 }
 #endif
 
 }
 #endif
 

+#if EV_IDLE_ENABLE

 void
 ev_idle_start (EV_P_ ev_idle *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
 
 void
 ev_idle_start (EV_P_ ev_idle *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
 

-  ev_start (EV_A_ (W)w, ++idlecnt);
-  array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
-  idles [idlecnt - 1] = w;
+  pri_adjust (EV_A_ (W)w);
+
+  {
+    int active = ++idlecnt [ABSPRI (w)];
+
+    ++idleall;
+    ev_start (EV_A_ (W)w, active);
+
+    array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
+    idles [ABSPRI (w)][active - 1] = w;
+  }

 }
 
 void
 ev_idle_stop (EV_P_ ev_idle *w)
 {
 }
 
 void
 ev_idle_stop (EV_P_ ev_idle *w)
 {

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

   if (expect_false (!ev_is_active (w)))
     return;
 
   {
     int active = ((W)w)->active;
   if (expect_false (!ev_is_active (w)))
     return;
 
   {
     int active = ((W)w)->active;

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

 
 

-  ev_stop (EV_A_ (W)w);
+    idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
+    ((W)idles [ABSPRI (w)][active - 1])->active = active;
+
+    ev_stop (EV_A_ (W)w);
+    --idleall;
+  }

 }
 }

+#endif

 
 void
 ev_prepare_start (EV_P_ ev_prepare *w)
 
 void
 ev_prepare_start (EV_P_ ev_prepare *w)


@@ -2018,7 +2211,7 @@ ev_prepare_start (EV_P_ ev_prepare *w)
 void
 ev_prepare_stop (EV_P_ ev_prepare *w)
 {
 void
 ev_prepare_stop (EV_P_ ev_prepare *w)
 {

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

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


@@ -2045,7 +2238,7 @@ ev_check_start (EV_P_ ev_check *w)
 void
 ev_check_stop (EV_P_ ev_check *w)
 {
 void
 ev_check_stop (EV_P_ ev_check *w)
 {

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

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


@@ -2062,11 +2255,11 @@ ev_check_stop (EV_P_ ev_check *w)
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {

-  ev_loop (w->loop, EVLOOP_NONBLOCK);
+  ev_loop (w->other, EVLOOP_NONBLOCK);

 }
 
 static void
 }
 
 static void

-embed_cb (EV_P_ ev_io *io, int revents)
+embed_io_cb (EV_P_ ev_io *io, int revents)

 {
   ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
 
 {
   ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
 


@@ -2076,6 +2269,14 @@ embed_cb (EV_P_ ev_io *io, int revents)
     ev_embed_sweep (loop, w);
 }
 
     ev_embed_sweep (loop, w);
 }
 

+static void
+embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
+{
+  ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
+
+  fd_reify (w->other);
+}
+

 void
 ev_embed_start (EV_P_ ev_embed *w)
 {
 void
 ev_embed_start (EV_P_ ev_embed *w)
 {


@@ -2083,25 +2284,30 @@ ev_embed_start (EV_P_ ev_embed *w)
     return;
 
   {
     return;
 
   {

-    struct ev_loop *loop = w->loop;
+    struct ev_loop *loop = w->other;

     assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
     assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));

-    ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
+    ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);

   }
 
   ev_set_priority (&w->io, ev_priority (w));
   ev_io_start (EV_A_ &w->io);
 
   }
 
   ev_set_priority (&w->io, ev_priority (w));
   ev_io_start (EV_A_ &w->io);
 

+  ev_prepare_init (&w->prepare, embed_prepare_cb);
+  ev_set_priority (&w->prepare, EV_MINPRI);
+  ev_prepare_start (EV_A_ &w->prepare);
+

   ev_start (EV_A_ (W)w, 1);
 }
 
 void
 ev_embed_stop (EV_P_ ev_embed *w)
 {
   ev_start (EV_A_ (W)w, 1);
 }
 
 void
 ev_embed_stop (EV_P_ ev_embed *w)
 {

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

   if (expect_false (!ev_is_active (w)))
     return;
 
   ev_io_stop (EV_A_ &w->io);
   if (expect_false (!ev_is_active (w)))
     return;
 
   ev_io_stop (EV_A_ &w->io);

+  ev_prepare_stop (EV_A_ &w->prepare);

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


@@ -2122,7 +2328,7 @@ ev_fork_start (EV_P_ ev_fork *w)
 void
 ev_fork_stop (EV_P_ ev_fork *w)
 {
 void
 ev_fork_stop (EV_P_ ev_fork *w)
 {

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

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


@@ -2200,6 +2406,10 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
     }
 }
 
     }
 }
 

+#if EV_MULTIPLICITY
+  #include "ev_wrap.h"
+#endif
+

 #ifdef __cplusplus
 }
 #endif
 #ifdef __cplusplus
 }
 #endif