*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 35180023c603d60532c1f2008223a822a8ecdc47..3fc528a251d1c61614516715667ac005aa477a6d 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -224,28 +224,29 @@ extern "C" {
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))

-# define inline_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 +399,44 @@ ev_now (EV_P)
 }
 #endif
 
 }
 #endif
 

-#define array_roundsize(type,n) (((n) | 4) & ~3)
+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 +444,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,17 +455,17 @@ 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_size


@@ -487,7 +510,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


@@ -727,7 +751,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


@@ -766,9 +790,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);
       }
 }


@@ -888,6 +912,12 @@ ev_backend (EV_P)
   return backend;
 }
 
   return backend;
 }
 

+unsigned int
+ev_loop_count (EV_P)
+{
+  return loop_count;
+}
+

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


@@ -977,17 +1007,21 @@ 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
+    }

 
   /* 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
 #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 +1167,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


@@ -1211,7 +1239,7 @@ periodics_reify (EV_P)
         }
       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 + floor ((ev_rt_now - w->offset) / 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);
         }
           assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
           downheap ((WT *)periodics, periodiccnt, 0);
         }


@@ -1235,7 +1263,7 @@ periodics_reschedule (EV_P)
       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 */
     }
 
   /* now rebuild the heap */


@@ -1244,6 +1272,29 @@ periodics_reschedule (EV_P)
 }
 #endif
 
 }
 #endif
 

+#if EV_IDLE_ENABLE
+void inline_size
+idle_reify (EV_P)
+{
+  if (expect_false (idleall))
+    {
+      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
+

 int inline_size
 time_update_monotonic (EV_P)
 {
 int inline_size
 time_update_monotonic (EV_P)
 {


@@ -1344,7 +1395,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 +1416,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);


@@ -1383,7 +1437,7 @@ ev_loop (EV_P_ int flags)
       {
         ev_tstamp block;
 
       {
         ev_tstamp block;
 

-        if (flags & EVLOOP_NONBLOCK || idlecnt)
+        if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))

           block = 0.; /* do not block at all */
         else
           {
           block = 0.; /* do not block at all */
         else
           {


@@ -1417,6 +1471,7 @@ ev_loop (EV_P_ int flags)
             if (expect_false (block < 0.)) block = 0.;
           }
 
             if (expect_false (block < 0.)) block = 0.;
           }
 

+        ++loop_count;

         backend_poll (EV_A_ block);
       }
 
         backend_poll (EV_A_ block);
       }
 


@@ -1429,9 +1484,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 +1495,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 +1533,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 +1542,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 +1585,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;


@@ -1523,10 +1602,10 @@ ev_io_start (EV_P_ ev_io *w)
   fd_change (EV_A_ fd);
 }
 
   fd_change (EV_A_ fd);
 }
 

-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;
 
   if (expect_false (!ev_is_active (w)))
     return;
 


@@ -1538,7 +1617,7 @@ ev_io_stop (EV_P_ ev_io *w)
   fd_change (EV_A_ w->fd);
 }
 
   fd_change (EV_A_ w->fd);
 }
 

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


@@ -1556,10 +1635,10 @@ ev_timer_start (EV_P_ ev_timer *w)
   /*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;
 


@@ -1580,7 +1659,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))


@@ -1601,7 +1680,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,8 +1692,10 @@ 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);
   array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
 
   ev_start (EV_A_ (W)w, ++periodiccnt);
   array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);


@@ -1624,10 +1705,10 @@ ev_periodic_start (EV_P_ ev_periodic *w)
   /*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;
 


@@ -1646,7 +1727,7 @@ ev_periodic_stop (EV_P_ ev_periodic *w)
   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 +1740,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


@@ -1688,10 +1769,10 @@ 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;
 


@@ -1718,7 +1799,7 @@ ev_child_start (EV_P_ ev_child *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;
 


@@ -1964,7 +2045,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 +2058,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 +2111,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 +2138,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;
 


@@ -2097,7 +2190,7 @@ ev_embed_start (EV_P_ ev_embed *w)
 void
 ev_embed_stop (EV_P_ ev_embed *w)
 {
 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;
 
   if (expect_false (!ev_is_active (w)))
     return;
 


@@ -2122,7 +2215,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;