[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.229 by root, Fri May 2 08:08:45 2008 UTC vs.
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC

 /*
  * libev event processing core, watcher management
  *
- * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de>
+ * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
  * tion, are permitted provided that the following conditions are met:
  *
 #  include EV_CONFIG_H
 # else
 #  include "config.h"
 # endif
+# if HAVE_CLOCK_SYSCALL
+#  ifndef EV_USE_CLOCK_SYSCALL
+#   define EV_USE_CLOCK_SYSCALL 1
+#   ifndef EV_USE_REALTIME
+#    define EV_USE_REALTIME  0
+#   endif
+#   ifndef EV_USE_MONOTONIC
+#    define EV_USE_MONOTONIC 1
+#   endif
+#  endif
+# elif !defined(EV_USE_CLOCK_SYSCALL)
+#  define EV_USE_CLOCK_SYSCALL 0
+# endif
 # if HAVE_CLOCK_GETTIME
 #  ifndef EV_USE_MONOTONIC
 #   define EV_USE_MONOTONIC 1
 #  endif
 #  ifndef EV_USE_REALTIME
-#   define EV_USE_REALTIME  1
+#   define EV_USE_REALTIME  0
 #  endif
 # else
 #  ifndef EV_USE_MONOTONIC
 #   define EV_USE_MONOTONIC 0
 #  endif
 #   define EV_USE_EVENTFD 1
 #  else
 #   define EV_USE_EVENTFD 0
 #  endif
 # endif
 #endif
 #include <math.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #ifndef _WIN32
 # include <sys/time.h>
 # include <sys/wait.h>
 # include <unistd.h>
 #else
+# include <io.h>
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # ifndef EV_SELECT_IS_WINSOCKET
 #  define EV_SELECT_IS_WINSOCKET 1
 # endif
 #endif
 /* this block tries to deduce configuration from header-defined symbols and defaults */
+#ifndef EV_USE_CLOCK_SYSCALL
+# if __linux && __GLIBC__ >= 2
+#  define EV_USE_CLOCK_SYSCALL 1
+# else
+#  define EV_USE_CLOCK_SYSCALL 0
+# endif
+#endif
 #ifndef EV_USE_MONOTONIC
+# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
+#  define EV_USE_MONOTONIC 1
+# else
-# define EV_USE_MONOTONIC 0
+#  define EV_USE_MONOTONIC 0
+# endif
 #endif
 #ifndef EV_USE_REALTIME
-# define EV_USE_REALTIME 0
+# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
 #endif
 #ifndef EV_USE_NANOSLEEP
+# if _POSIX_C_SOURCE >= 199309L
+#  define EV_USE_NANOSLEEP 1
+# else
-# define EV_USE_NANOSLEEP 0
+#  define EV_USE_NANOSLEEP 0
+# endif
 #endif
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
 # else
 #  define EV_USE_EVENTFD 0
 # endif
 #endif
+#if 0 /* debugging */
+# define EV_VERIFY 3
+# define EV_USE_4HEAP 1
+# define EV_HEAP_CACHE_AT 1
+#endif
+#ifndef EV_VERIFY
+# define EV_VERIFY !EV_MINIMAL
+#endif
+#ifndef EV_USE_4HEAP
+# define EV_USE_4HEAP !EV_MINIMAL
+#endif
+#ifndef EV_HEAP_CACHE_AT
+# define EV_HEAP_CACHE_AT !EV_MINIMAL
+#endif
+/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
+/* which makes programs even slower. might work on other unices, too. */
+#if EV_USE_CLOCK_SYSCALL
+# include <syscall.h>
+# ifdef SYS_clock_gettime
+#  define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
+#  undef EV_USE_MONOTONIC
+#  define EV_USE_MONOTONIC 1
+# else
+#  undef EV_USE_CLOCK_SYSCALL
+#  define EV_USE_CLOCK_SYSCALL 0
+# endif
+#endif
 /* this block fixes any misconfiguration where we know we run into trouble otherwise */
 #ifndef CLOCK_MONOTONIC
 # undef EV_USE_MONOTONIC
 # define EV_USE_MONOTONIC 0
 #  include <sys/select.h>
 # endif
 #endif
 #if EV_USE_INOTIFY
+# include <sys/utsname.h>
+# include <sys/statfs.h>
 # include <sys/inotify.h>
+/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
+# ifndef IN_DONT_FOLLOW
+#  undef EV_USE_INOTIFY
+#  define EV_USE_INOTIFY 0
+# endif
 #endif
 #if EV_SELECT_IS_WINSOCKET
 # include <winsock.h>
 #endif
 }
 # endif
 #endif
 /**/
+#if EV_VERIFY >= 3
+# define EV_FREQUENT_CHECK ev_loop_verify (EV_A)
+#else
+# define EV_FREQUENT_CHECK do { } while (0)
+#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
 # 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)
+#if EV_MINPRI == EV_MAXPRI
+# define ABSPRI(w) (((W)w), 0)
+#else
-#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
+# define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
+#endif
 #define EMPTY       /* required for microsofts broken pseudo-c compiler */
 #define EMPTY2(a,b) /* used to suppress some warnings */
 typedef ev_watcher *W;
 typedef ev_watcher_time *WT;
 #define ev_active(w) ((W)(w))->active
 #define ev_at(w) ((WT)(w))->at
-#if EV_USE_MONOTONIC
+#if EV_USE_REALTIME
 /* sig_atomic_t is used to avoid per-thread variables or locking but still */
 /* giving it a reasonably high chance of working on typical architetcures */
+static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
+#endif
+#if EV_USE_MONOTONIC
 static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 #endif
 #ifdef _WIN32
 # include "ev_win32.c"
 {
   syserr_cb = cb;
 }
 static void noinline
-syserr (const char *msg)
+ev_syserr (const char *msg)
 {
   if (!msg)
     msg = "(libev) system error";
   if (syserr_cb)
 #define ev_malloc(size) ev_realloc (0, (size))
 #define ev_free(ptr)    ev_realloc ((ptr), 0)
 /*****************************************************************************/
+/* set in reify when reification needed */
+#define EV_ANFD_REIFY 1
+/* file descriptor info structure */
 typedef struct
 {
   WL head;
-  unsigned char events;
+  unsigned char events; /* the events watched for */
+  unsigned char reify;  /* flag set when this ANFD needs reification (EV_ANFD_REIFY, EV__IOFDSET) */
+  unsigned char emask;  /* the epoll backend stores the actual kernel mask in here */
-  unsigned char reify;
+  unsigned char unused;
+#if EV_USE_EPOLL
+  unsigned int egen;    /* generation counter to counter epoll bugs */
+#endif
 #if EV_SELECT_IS_WINSOCKET
   SOCKET handle;
 #endif
 } ANFD;
+/* stores the pending event set for a given watcher */
 typedef struct
 {
   W w;
-  int events;
+  int events; /* the pending event set for the given watcher */
 } ANPENDING;
 #if EV_USE_INOTIFY
+/* hash table entry per inotify-id */
 typedef struct
 {
   WL head;
 } ANFS;
+#endif
+/* Heap Entry */
+#if EV_HEAP_CACHE_AT
+  /* a heap element */
+  typedef struct {
+    ev_tstamp at;
+    WT w;
+  } ANHE;
+  #define ANHE_w(he)        (he).w     /* access watcher, read-write */
+  #define ANHE_at(he)       (he).at    /* access cached at, read-only */
+  #define ANHE_at_cache(he) (he).at = (he).w->at /* update at from watcher */
+#else
+  /* a heap element */
+  typedef WT ANHE;
+  #define ANHE_w(he)        (he)
+  #define ANHE_at(he)       (he)->at
+  #define ANHE_at_cache(he)
 #endif
 #if EV_MULTIPLICITY
   struct ev_loop
   static int ev_default_loop_ptr;
 #endif
+#if EV_MINIMAL < 2
+# define EV_RELEASE_CB if (expect_false (release_cb)) release_cb (EV_A)
+# define EV_ACQUIRE_CB if (expect_false (acquire_cb)) acquire_cb (EV_A)
+# define EV_INVOKE_PENDING invoke_cb (EV_A)
+#else
+# define EV_RELEASE_CB (void)0
+# define EV_ACQUIRE_CB (void)0
+# define EV_INVOKE_PENDING ev_invoke_pending (EV_A)
+#endif
+#define EVUNLOOP_RECURSE 0x80
 /*****************************************************************************/
+#ifndef EV_HAVE_EV_TIME
 ev_tstamp
 ev_time (void)
 {
 #if EV_USE_REALTIME
+  if (expect_true (have_realtime))
+    {
-  struct timespec ts;
+      struct timespec ts;
-  clock_gettime (CLOCK_REALTIME, &ts);
+      clock_gettime (CLOCK_REALTIME, &ts);
-  return ts.tv_sec + ts.tv_nsec * 1e-9;
+      return ts.tv_sec + ts.tv_nsec * 1e-9;
-#else
+    }
+#endif
   struct timeval tv;
   gettimeofday (&tv, 0);
   return tv.tv_sec + tv.tv_usec * 1e-6;
-#endif
 }
+#endif
-ev_tstamp inline_size
+inline_size ev_tstamp
 get_clock (void)
 {
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
       struct timeval tv;
       tv.tv_sec  = (time_t)delay;
       tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
+      /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
+      /* something not guaranteed by newer posix versions, but guaranteed */
+      /* by older ones */
       select (0, 0, 0, 0, &tv);
 #endif
     }
 }
 /*****************************************************************************/
-int inline_size
+#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
+/* find a suitable new size for the given array, */
+/* hopefully by rounding to a ncie-to-malloc size */
+inline_size int
 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 size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
-  if (elem * ncur > 4096)
+  if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
     {
       ncur *= elem;
-      ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
+      ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
       ncur = ncur - sizeof (void *) * 4;
       ncur /= elem;
     }
   return ncur;
 array_realloc (int elem, void *base, int *cur, int cnt)
 {
   *cur = array_nextsize (elem, *cur, cnt);
   return ev_realloc (base, elem * *cur);
 }
+#define array_init_zero(base,count)	\
+  memset ((void *)(base), 0, sizeof (*(base)) * (count))
 #define array_needsize(type,base,cur,cnt,init)			\
   if (expect_false ((cnt) > (cur)))				\
     {								\
       int ocur_ = (cur);					\
       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;
+  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
 /*****************************************************************************/
+/* dummy callback for pending events */
+static void noinline
+pendingcb (EV_P_ ev_prepare *w, int revents)
+{
+}
 void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
       pendings [pri][w_->pending - 1].w      = w_;
       pendings [pri][w_->pending - 1].events = revents;
     }
 }
-void inline_speed
+inline_speed void
+feed_reverse (EV_P_ W w)
+{
+  array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
+  rfeeds [rfeedcnt++] = w;
+}
+inline_size void
+feed_reverse_done (EV_P_ int revents)
+{
+  do
+    ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
+  while (rfeedcnt);
+}
+inline_speed void
 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);
 }
 /*****************************************************************************/
-void inline_size
+inline_speed void
-anfds_init (ANFD *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->events = EV_NONE;
-      base->reify  = 0;
-      ++base;
-    }
-}
-void inline_speed
-fd_event (EV_P_ int fd, int revents)
+fd_event_nc (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
   ev_io *w;
   for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
       if (ev)
         ev_feed_event (EV_A_ (W)w, ev);
     }
 }
+/* do not submit kernel events for fds that have reify set */
+/* because that means they changed while we were polling for new events */
+inline_speed void
+fd_event (EV_P_ int fd, int revents)
+{
+  ANFD *anfd = anfds + fd;
+  if (expect_true (!anfd->reify))
+    fd_event_nc (EV_A_ fd, revents);
+}
 void
 ev_feed_fd_event (EV_P_ int fd, int revents)
 {
   if (fd >= 0 && fd < anfdmax)
-    fd_event (EV_A_ fd, revents);
+    fd_event_nc (EV_A_ fd, revents);
 }
-void inline_size
+/* make sure the external fd watch events are in-sync */
+/* with the kernel/libev internal state */
+inline_size void
 fd_reify (EV_P)
 {
   int i;
   for (i = 0; i < fdchangecnt; ++i)
         events |= (unsigned char)w->events;
 #if EV_SELECT_IS_WINSOCKET
       if (events)
         {
-          unsigned long argp;
+          unsigned long arg;
           #ifdef EV_FD_TO_WIN32_HANDLE
             anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
           #else
             anfd->handle = _get_osfhandle (fd);
           #endif
-          assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
+          assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
         }
 #endif
       {
         unsigned char o_events = anfd->events;
         unsigned char o_reify  = anfd->reify;
         anfd->reify  = 0;
         anfd->events = events;
-        if (o_events != events || o_reify & EV_IOFDSET)
+        if (o_events != events || o_reify & EV__IOFDSET)
           backend_modify (EV_A_ fd, o_events, events);
       }
     }
   fdchangecnt = 0;
 }
-void inline_size
+/* something about the given fd changed */
+inline_size void
 fd_change (EV_P_ int fd, int flags)
 {
   unsigned char reify = anfds [fd].reify;
   anfds [fd].reify |= flags;
       array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
       fdchanges [fdchangecnt - 1] = fd;
     }
 }
-void inline_speed
+/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
+inline_speed void
 fd_kill (EV_P_ int fd)
 {
   ev_io *w;
   while ((w = (ev_io *)anfds [fd].head))
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
-int inline_size
+/* check whether the given fd is atcually valid, for error recovery */
+inline_size int
 fd_valid (int fd)
 {
 #ifdef _WIN32
   return _get_osfhandle (fd) != -1;
 #else
 {
   int fd;
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
-      if (!fd_valid (fd) == -1 && errno == EBADF)
+      if (!fd_valid (fd) && errno == EBADF)
         fd_kill (EV_A_ fd);
 }
 /* called on ENOMEM in select/poll to kill some fds and retry */
 static void noinline
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
+        anfds [fd].emask  = 0;
-        fd_change (EV_A_ fd, EV_IOFDSET | 1);
+        fd_change (EV_A_ fd, EV__IOFDSET | EV_ANFD_REIFY);
       }
 }
 /*****************************************************************************/
+/*
+ * the heap functions want a real array index. array index 0 uis guaranteed to not
+ * be in-use at any time. the first heap entry is at array [HEAP0]. DHEAP gives
+ * the branching factor of the d-tree.
+ */
+/*
+ * at the moment we allow libev the luxury of two heaps,
+ * a small-code-size 2-heap one and a ~1.5kb larger 4-heap
+ * which is more cache-efficient.
+ * the difference is about 5% with 50000+ watchers.
+ */
+#if EV_USE_4HEAP
+#define DHEAP 4
+#define HEAP0 (DHEAP - 1) /* index of first element in heap */
+#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
+#define UPHEAP_DONE(p,k) ((p) == (k))
+/* away from the root */
+inline_speed void
+downheap (ANHE *heap, int N, int k)
+{
+  ANHE he = heap [k];
+  ANHE *E = heap + N + HEAP0;
+  for (;;)
+    {
+      ev_tstamp minat;
+      ANHE *minpos;
+      ANHE *pos = heap + DHEAP * (k - HEAP0) + HEAP0 + 1;
+      /* find minimum child */
+      if (expect_true (pos + DHEAP - 1 < E))
+        {
+          /* fast path */                               (minpos = pos + 0), (minat = ANHE_at (*minpos));
+          if (               ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
+          if (               ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
+          if (               ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
+        }
+      else if (pos < E)
+        {
+          /* slow path */                               (minpos = pos + 0), (minat = ANHE_at (*minpos));
+          if (pos + 1 < E && ANHE_at (pos [1]) < minat) (minpos = pos + 1), (minat = ANHE_at (*minpos));
+          if (pos + 2 < E && ANHE_at (pos [2]) < minat) (minpos = pos + 2), (minat = ANHE_at (*minpos));
+          if (pos + 3 < E && ANHE_at (pos [3]) < minat) (minpos = pos + 3), (minat = ANHE_at (*minpos));
+        }
+      else
+        break;
+      if (ANHE_at (he) <= minat)
+        break;
+      heap [k] = *minpos;
+      ev_active (ANHE_w (*minpos)) = k;
+      k = minpos - heap;
+    }
+  heap [k] = he;
+  ev_active (ANHE_w (he)) = k;
+}
+#else /* 4HEAP */
+#define HEAP0 1
+#define HPARENT(k) ((k) >> 1)
+#define UPHEAP_DONE(p,k) (!(p))
+/* away from the root */
+inline_speed void
+downheap (ANHE *heap, int N, int k)
+{
+  ANHE he = heap [k];
+  for (;;)
+    {
+      int c = k << 1;
+      if (c > N + HEAP0 - 1)
+        break;
+      c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
+           ? 1 : 0;
+      if (ANHE_at (he) <= ANHE_at (heap [c]))
+        break;
+      heap [k] = heap [c];
+      ev_active (ANHE_w (heap [k])) = k;
+      k = c;
+    }
+  heap [k] = he;
+  ev_active (ANHE_w (he)) = k;
+}
+#endif
 /* towards the root */
-void inline_speed
+inline_speed void
-upheap (WT *heap, int k)
+upheap (ANHE *heap, int k)
 {
-  WT w = heap [k];
+  ANHE he = heap [k];
   for (;;)
     {
-      int p = k >> 1;
+      int p = HPARENT (k);
-      /* maybe we could use a dummy element at heap [0]? */
+      if (UPHEAP_DONE (p, k) || ANHE_at (heap [p]) <= ANHE_at (he))
-      if (!p || heap [p]->at <= w->at)
         break;
       heap [k] = heap [p];
-      ((W)heap [k])->active = k;
+      ev_active (ANHE_w (heap [k])) = k;
       k = p;
     }
-  heap [k] = w;
+  heap [k] = he;
-  ((W)heap [k])->active = k;
+  ev_active (ANHE_w (he)) = k;
 }
-/* away from the root */
+/* move an element suitably so it is in a correct place */
-void inline_speed
+inline_size void
-downheap (WT *heap, int N, int k)
-{
-  WT w = heap [k];
-  for (;;)
-    {
-      int c = k << 1;
-      if (c > N)
-        break;
-      c += c < N && heap [c]->at > heap [c + 1]->at
-           ? 1 : 0;
-      if (w->at <= heap [c]->at)
-        break;
-      heap [k] = heap [c];
-      ((W)heap [k])->active = k;
-      k = c;
-    }
-  heap [k] = w;
-  ((W)heap [k])->active = k;
-}
-void inline_size
-adjustheap (WT *heap, int N, int k)
+adjustheap (ANHE *heap, int N, int k)
 {
+  if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
-  upheap (heap, k);
+    upheap (heap, k);
+  else
-  downheap (heap, N, k);
+    downheap (heap, N, k);
+}
+/* rebuild the heap: this function is used only once and executed rarely */
+inline_size void
+reheap (ANHE *heap, int N)
+{
+  int i;
+  /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
+  /* also, this is easy to implement and correct for both 2-heaps and 4-heaps */
+  for (i = 0; i < N; ++i)
+    upheap (heap, i + HEAP0);
 }
 /*****************************************************************************/
+/* associate signal watchers to a signal signal */
 typedef struct
 {
   WL head;
   EV_ATOMIC_T gotsig;
 } ANSIG;
 static ANSIG *signals;
 static int signalmax;
 static EV_ATOMIC_T gotsig;
-void inline_size
-signals_init (ANSIG *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->gotsig = 0;
-      ++base;
-    }
-}
 /*****************************************************************************/
-void inline_speed
+/* used to prepare libev internal fd's */
+/* this is not fork-safe */
+inline_speed void
 fd_intern (int fd)
 {
 #ifdef _WIN32
-  int arg = 1;
+  unsigned long arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
 #else
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   fcntl (fd, F_SETFL, O_NONBLOCK);
 #endif
 }
 static void noinline
 evpipe_init (EV_P)
 {
-  if (!ev_is_active (&pipeev))
+  if (!ev_is_active (&pipe_w))
     {
 #if EV_USE_EVENTFD
       if ((evfd = eventfd (0, 0)) >= 0)
         {
           evpipe [0] = -1;
           fd_intern (evfd);
-          ev_io_set (&pipeev, evfd, EV_READ);
+          ev_io_set (&pipe_w, evfd, EV_READ);
         }
       else
 #endif
         {
           while (pipe (evpipe))
-            syserr ("(libev) error creating signal/async pipe");
+            ev_syserr ("(libev) error creating signal/async pipe");
           fd_intern (evpipe [0]);
           fd_intern (evpipe [1]);
-          ev_io_set (&pipeev, evpipe [0], EV_READ);
+          ev_io_set (&pipe_w, evpipe [0], EV_READ);
         }
-      ev_io_start (EV_A_ &pipeev);
+      ev_io_start (EV_A_ &pipe_w);
       ev_unref (EV_A); /* watcher should not keep loop alive */
     }
 }
-void inline_size
+inline_size void
 evpipe_write (EV_P_ EV_ATOMIC_T *flag)
 {
   if (!*flag)
     {
       int old_errno = errno; /* save errno because write might clobber it */
       errno = old_errno;
     }
 }
+/* called whenever the libev signal pipe */
+/* got some events (signal, async) */
 static void
 pipecb (EV_P_ ev_io *iow, int revents)
 {
 #if EV_USE_EVENTFD
   if (evfd >= 0)
     {
-      uint64_t counter = 1;
+      uint64_t counter;
       read (evfd, &counter, sizeof (uint64_t));
     }
   else
 #endif
     {
 ev_feed_signal_event (EV_P_ int signum)
 {
   WL w;
 #if EV_MULTIPLICITY
-  assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   --signum;
   if (signum < 0 || signum >= signalmax)
 #ifndef WIFCONTINUED
 # define WIFCONTINUED(status) 0
 #endif
-void inline_speed
+/* handle a single child status event */
+inline_speed void
 child_reap (EV_P_ int chain, int pid, int status)
 {
   ev_child *w;
   int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif
+/* called on sigchld etc., calls waitpid */
 static void
 childcb (EV_P_ ev_signal *sw, int revents)
 {
   int pid, status;
   /* kqueue is borked on everything but netbsd apparently */
   /* it usually doesn't work correctly on anything but sockets and pipes */
   flags &= ~EVBACKEND_KQUEUE;
 #endif
 #ifdef __APPLE__
-  // flags &= ~EVBACKEND_KQUEUE; for documentation
+  /* only select works correctly on that "unix-certified" platform */
-  flags &= ~EVBACKEND_POLL;
+  flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
+  flags &= ~EVBACKEND_POLL;   /* poll is based on kqueue from 10.5 onwards */
 #endif
   return flags;
 }
 ev_backend (EV_P)
 {
   return backend;
 }
+#if EV_MINIMAL < 2
 unsigned int
 ev_loop_count (EV_P)
 {
   return loop_count;
 }
+unsigned int
+ev_loop_depth (EV_P)
+{
+  return loop_depth;
+}
 void
 ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
 {
   io_blocktime = interval;
 }
 ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
 {
   timeout_blocktime = interval;
 }
+void
+ev_set_userdata (EV_P_ void *data)
+{
+  userdata = data;
+}
+void *
+ev_userdata (EV_P)
+{
+  return userdata;
+}
+void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
+{
+  invoke_cb = invoke_pending_cb;
+}
+void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
+{
+  release_cb = release;
+  acquire_cb = acquire;
+}
+#endif
+/* initialise a loop structure, must be zero-initialised */
 static void noinline
 loop_init (EV_P_ unsigned int flags)
 {
   if (!backend)
     {
+#if EV_USE_REALTIME
+      if (!have_realtime)
+        {
+          struct timespec ts;
+          if (!clock_gettime (CLOCK_REALTIME, &ts))
+            have_realtime = 1;
+        }
+#endif
 #if EV_USE_MONOTONIC
+      if (!have_monotonic)
-      {
+        {
-        struct timespec ts;
+          struct timespec ts;
-        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-          have_monotonic = 1;
+            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 EV_MINIMAL < 2
+      invoke_cb         = ev_invoke_pending;
+#endif
       io_blocktime      = 0.;
       timeout_blocktime = 0.;
       backend           = 0;
       backend_fd        = -1;
 #endif
 #if EV_USE_SELECT
       if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
 #endif
+      ev_prepare_init (&pending_w, pendingcb);
-      ev_init (&pipeev, pipecb);
+      ev_init (&pipe_w, pipecb);
-      ev_set_priority (&pipeev, EV_MAXPRI);
+      ev_set_priority (&pipe_w, EV_MAXPRI);
     }
 }
+/* free up a loop structure */
 static void noinline
 loop_destroy (EV_P)
 {
   int i;
-  if (ev_is_active (&pipeev))
+  if (ev_is_active (&pipe_w))
     {
       ev_ref (EV_A); /* signal watcher */
-      ev_io_stop (EV_A_ &pipeev);
+      ev_io_stop (EV_A_ &pipe_w);
 #if EV_USE_EVENTFD
       if (evfd >= 0)
         close (evfd);
 #endif
     }
   ev_free (anfds); anfdmax = 0;
   /* have to use the microsoft-never-gets-it-right macro */
+  array_free (rfeed, EMPTY);
   array_free (fdchange, EMPTY);
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);
 #endif
   backend = 0;
 }
 #if EV_USE_INOTIFY
-void inline_size infy_fork (EV_P);
+inline_size void infy_fork (EV_P);
 #endif
-void inline_size
+inline_size void
 loop_fork (EV_P)
 {
 #if EV_USE_PORT
   if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);
 #endif
 #endif
 #if EV_USE_INOTIFY
   infy_fork (EV_A);
 #endif
-  if (ev_is_active (&pipeev))
+  if (ev_is_active (&pipe_w))
     {
       /* this "locks" the handlers against writing to the pipe */
       /* while we modify the fd vars */
       gotsig = 1;
 #if EV_ASYNC_ENABLE
       gotasync = 1;
 #endif
       ev_ref (EV_A);
-      ev_io_stop (EV_A_ &pipeev);
+      ev_io_stop (EV_A_ &pipe_w);
 #if EV_USE_EVENTFD
       if (evfd >= 0)
         close (evfd);
 #endif
           close (evpipe [1]);
         }
       evpipe_init (EV_A);
       /* now iterate over everything, in case we missed something */
-      pipecb (EV_A_ &pipeev, EV_READ);
+      pipecb (EV_A_ &pipe_w, EV_READ);
     }
   postfork = 0;
 }
 #if EV_MULTIPLICITY
 struct ev_loop *
 ev_loop_new (unsigned int flags)
 {
   struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
 void
 ev_loop_fork (EV_P)
 {
   postfork = 1; /* must be in line with ev_default_fork */
 }
+#endif /* multiplicity */
+#if EV_VERIFY
+static void noinline
+verify_watcher (EV_P_ W w)
+{
+  assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
+  if (w->pending)
+    assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
+}
+static void noinline
+verify_heap (EV_P_ ANHE *heap, int N)
+{
+  int i;
+  for (i = HEAP0; i < N + HEAP0; ++i)
+    {
+      assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
+      assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
+      assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
+      verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
+    }
+}
+static void noinline
+array_verify (EV_P_ W *ws, int cnt)
+{
+  while (cnt--)
+    {
+      assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
+      verify_watcher (EV_A_ ws [cnt]);
+    }
+}
+#endif
+#if EV_MINIMAL < 2
+void
+ev_loop_verify (EV_P)
+{
+#if EV_VERIFY
+  int i;
+  WL w;
+  assert (activecnt >= -1);
+  assert (fdchangemax >= fdchangecnt);
+  for (i = 0; i < fdchangecnt; ++i)
+    assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
+  assert (anfdmax >= 0);
+  for (i = 0; i < anfdmax; ++i)
+    for (w = anfds [i].head; w; w = w->next)
+      {
+        verify_watcher (EV_A_ (W)w);
+        assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
+        assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
+      }
+  assert (timermax >= timercnt);
+  verify_heap (EV_A_ timers, timercnt);
+#if EV_PERIODIC_ENABLE
+  assert (periodicmax >= periodiccnt);
+  verify_heap (EV_A_ periodics, periodiccnt);
+#endif
+  for (i = NUMPRI; i--; )
+    {
+      assert (pendingmax [i] >= pendingcnt [i]);
+#if EV_IDLE_ENABLE
+      assert (idleall >= 0);
+      assert (idlemax [i] >= idlecnt [i]);
+      array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
+#endif
+    }
+#if EV_FORK_ENABLE
+  assert (forkmax >= forkcnt);
+  array_verify (EV_A_ (W *)forks, forkcnt);
+#endif
+#if EV_ASYNC_ENABLE
+  assert (asyncmax >= asynccnt);
+  array_verify (EV_A_ (W *)asyncs, asynccnt);
+#endif
+  assert (preparemax >= preparecnt);
+  array_verify (EV_A_ (W *)prepares, preparecnt);
+  assert (checkmax >= checkcnt);
+  array_verify (EV_A_ (W *)checks, checkcnt);
+# if 0
+  for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
+  for (signum = signalmax; signum--; ) if (signals [signum].gotsig)
+# endif
+#endif
+}
 #endif
 #if EV_MULTIPLICITY
 struct ev_loop *
 ev_default_loop_init (unsigned int flags)
 {
 #if EV_MULTIPLICITY
   struct ev_loop *loop = ev_default_loop_ptr;
 #endif
+  ev_default_loop_ptr = 0;
 #ifndef _WIN32
   ev_ref (EV_A); /* child watcher */
   ev_signal_stop (EV_A_ &childev);
 #endif
 {
 #if EV_MULTIPLICITY
   struct ev_loop *loop = ev_default_loop_ptr;
 #endif
-  if (backend)
-    postfork = 1; /* must be in line with ev_loop_fork */
+  postfork = 1; /* must be in line with ev_loop_fork */
 }
 /*****************************************************************************/
 void
 ev_invoke (EV_P_ void *w, int revents)
 {
   EV_CB_INVOKE ((W)w, revents);
 }
-void inline_speed
+unsigned int
-call_pending (EV_P)
+ev_pending_count (EV_P)
+{
+  int pri;
+  unsigned int count = 0;
+  for (pri = NUMPRI; pri--; )
+    count += pendingcnt [pri];
+  return count;
+}
+void noinline
+ev_invoke_pending (EV_P)
 {
   int pri;
   for (pri = NUMPRI; pri--; )
     while (pendingcnt [pri])
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
-        if (expect_true (p->w))
-          {
-            /*assert (("non-pending watcher on pending list", p->w->pending));*/
+        /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
+        /* ^ this is no longer true, as pending_w could be here */
-            p->w->pending = 0;
+        p->w->pending = 0;
-            EV_CB_INVOKE (p->w, p->events);
+        EV_CB_INVOKE (p->w, p->events);
-          }
+        EV_FREQUENT_CHECK;
       }
 }
-void inline_size
-timers_reify (EV_P)
-{
-  while (timercnt && ev_at (timers [1]) <= mn_now)
-    {
-      ev_timer *w = (ev_timer *)timers [1];
-      /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
-      /* first reschedule or stop timer */
-      if (w->repeat)
-        {
-          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
-          ev_at (w) += w->repeat;
-          if (ev_at (w) < mn_now)
-            ev_at (w) = mn_now;
-          downheap (timers, timercnt, 1);
-        }
-      else
-        ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
-      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
-    }
-}
-#if EV_PERIODIC_ENABLE
-void inline_size
-periodics_reify (EV_P)
-{
-  while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
-    {
-      ev_periodic *w = (ev_periodic *)periodics [1];
-      /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
-      /* first reschedule or stop timer */
-      if (w->reschedule_cb)
-        {
-          ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
-          assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
-          downheap (periodics, periodiccnt, 1);
-        }
-      else if (w->interval)
-        {
-          ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
-          if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
-          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
-          downheap (periodics, periodiccnt, 1);
-        }
-      else
-        ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
-      ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
-    }
-}
-static void noinline
-periodics_reschedule (EV_P)
-{
-  int i;
-  /* adjust periodics after time jump */
-  for (i = 0; i < periodiccnt; ++i)
-    {
-      ev_periodic *w = (ev_periodic *)periodics [i];
-      if (w->reschedule_cb)
-        ev_at (w) = w->reschedule_cb (w, ev_rt_now);
-      else if (w->interval)
-        ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
-    }
-  /* now rebuild the heap */
-  for (i = periodiccnt >> 1; i--; )
-    downheap (periodics, periodiccnt, i);
-}
-#endif
 #if EV_IDLE_ENABLE
-void inline_size
+/* make idle watchers pending. this handles the "call-idle */
+/* only when higher priorities are idle" logic */
+inline_size void
 idle_reify (EV_P)
 {
   if (expect_false (idleall))
     {
       int pri;
         }
     }
 }
 #endif
-void inline_speed
+/* make timers pending */
+inline_size void
+timers_reify (EV_P)
+{
+  EV_FREQUENT_CHECK;
+  if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
+    {
+      do
+        {
+          ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
+          /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
+          /* first reschedule or stop timer */
+          if (w->repeat)
+            {
+              ev_at (w) += w->repeat;
+              if (ev_at (w) < mn_now)
+                ev_at (w) = mn_now;
+              assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
+              ANHE_at_cache (timers [HEAP0]);
+              downheap (timers, timercnt, HEAP0);
+            }
+          else
+            ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
+          EV_FREQUENT_CHECK;
+          feed_reverse (EV_A_ (W)w);
+        }
+      while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
+      feed_reverse_done (EV_A_ EV_TIMEOUT);
+    }
+}
+#if EV_PERIODIC_ENABLE
+/* make periodics pending */
+inline_size void
+periodics_reify (EV_P)
+{
+  EV_FREQUENT_CHECK;
+  while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
+    {
+      int feed_count = 0;
+      do
+        {
+          ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
+          /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
+          /* first reschedule or stop timer */
+          if (w->reschedule_cb)
+            {
+              ev_at (w) = w->reschedule_cb (w, ev_rt_now);
+              assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
+              ANHE_at_cache (periodics [HEAP0]);
+              downheap (periodics, periodiccnt, HEAP0);
+            }
+          else if (w->interval)
+            {
+              ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+              /* if next trigger time is not sufficiently in the future, put it there */
+              /* this might happen because of floating point inexactness */
+              if (ev_at (w) - ev_rt_now < TIME_EPSILON)
+                {
+                  ev_at (w) += w->interval;
+                  /* if interval is unreasonably low we might still have a time in the past */
+                  /* so correct this. this will make the periodic very inexact, but the user */
+                  /* has effectively asked to get triggered more often than possible */
+                  if (ev_at (w) < ev_rt_now)
+                    ev_at (w) = ev_rt_now;
+                }
+              ANHE_at_cache (periodics [HEAP0]);
+              downheap (periodics, periodiccnt, HEAP0);
+            }
+          else
+            ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
+          EV_FREQUENT_CHECK;
+          feed_reverse (EV_A_ (W)w);
+        }
+      while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
+      feed_reverse_done (EV_A_ EV_PERIODIC);
+    }
+}
+/* simply recalculate all periodics */
+/* TODO: maybe ensure that at leats one event happens when jumping forward? */
+static void noinline
+periodics_reschedule (EV_P)
+{
+  int i;
+  /* adjust periodics after time jump */
+  for (i = HEAP0; i < periodiccnt + HEAP0; ++i)
+    {
+      ev_periodic *w = (ev_periodic *)ANHE_w (periodics [i]);
+      if (w->reschedule_cb)
+        ev_at (w) = w->reschedule_cb (w, ev_rt_now);
+      else if (w->interval)
+        ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
+      ANHE_at_cache (periodics [i]);
+    }
+  reheap (periodics, periodiccnt);
+}
+#endif
+/* adjust all timers by a given offset */
+static void noinline
+timers_reschedule (EV_P_ ev_tstamp adjust)
+{
+  int i;
+  for (i = 0; i < timercnt; ++i)
+    {
+      ANHE *he = timers + i + HEAP0;
+      ANHE_w (*he)->at += adjust;
+      ANHE_at_cache (*he);
+    }
+}
+/* fetch new monotonic and realtime times from the kernel */
+/* also detetc if there was a timejump, and act accordingly */
+inline_speed void
 time_update (EV_P_ ev_tstamp max_block)
 {
-  int i;
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
+      int i;
       ev_tstamp odiff = rtmn_diff;
       mn_now = get_clock ();
       /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
        */
       for (i = 4; --i; )
         {
           rtmn_diff = ev_rt_now - mn_now;
-          if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
+          if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
             return; /* all is well */
           ev_rt_now = ev_time ();
           mn_now    = get_clock ();
           now_floor = mn_now;
         }
+      /* no timer adjustment, as the monotonic clock doesn't jump */
+      /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
 # if EV_PERIODIC_ENABLE
       periodics_reschedule (EV_A);
 # endif
-      /* no timer adjustment, as the monotonic clock doesn't jump */
-      /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
     }
   else
 #endif
     {
       ev_rt_now = ev_time ();
       if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
         {
+          /* adjust timers. this is easy, as the offset is the same for all of them */
+          timers_reschedule (EV_A_ ev_rt_now - mn_now);
 #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 = 1; i <= timercnt; ++i)
-            ev_at (timers [i]) += ev_rt_now - mn_now;
         }
       mn_now = ev_rt_now;
     }
 }
 void
-ev_ref (EV_P)
-{
-  ++activecnt;
-}
-void
-ev_unref (EV_P)
-{
-  --activecnt;
-}
-static int loop_done;
-void
 ev_loop (EV_P_ int flags)
 {
+#if EV_MINIMAL < 2
+  ++loop_depth;
+#endif
+  assert (("libev: ev_loop recursion during release detected", loop_done != EVUNLOOP_RECURSE));
   loop_done = EVUNLOOP_CANCEL;
-  call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
+  EV_INVOKE_PENDING; /* in case we recurse, ensure ordering stays nice and clean */
   do
     {
+#if EV_VERIFY >= 2
+      ev_loop_verify (EV_A);
+#endif
 #ifndef _WIN32
       if (expect_false (curpid)) /* penalise the forking check even more */
         if (expect_false (getpid () != curpid))
           {
             curpid = getpid ();
       /* we might have forked, so queue fork handlers */
       if (expect_false (postfork))
         if (forkcnt)
           {
             queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
-            call_pending (EV_A);
+            EV_INVOKE_PENDING;
           }
 #endif
       /* queue prepare watchers (and execute them) */
       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
-          call_pending (EV_A);
+          EV_INVOKE_PENDING;
         }
-      if (expect_false (!activecnt))
+      if (expect_false (loop_done))
         break;
       /* we might have forked, so reify kernel state if necessary */
       if (expect_false (postfork))
         loop_fork (EV_A);
         ev_tstamp waittime  = 0.;
         ev_tstamp sleeptime = 0.;
         if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
           {
+            /* remember old timestamp for io_blocktime calculation */
+            ev_tstamp prev_mn_now = mn_now;
             /* update time to cancel out callback processing overhead */
             time_update (EV_A_ 1e100);
             waittime = MAX_BLOCKTIME;
             if (timercnt)
               {
-                ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
+                ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge;
                 if (waittime > to) waittime = to;
               }
 #if EV_PERIODIC_ENABLE
             if (periodiccnt)
               {
-                ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
+                ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
                 if (waittime > to) waittime = to;
               }
 #endif
+            /* don't let timeouts decrease the waittime below timeout_blocktime */
             if (expect_false (waittime < timeout_blocktime))
               waittime = timeout_blocktime;
-            sleeptime = waittime - backend_fudge;
+            /* extra check because io_blocktime is commonly 0 */
-            if (expect_true (sleeptime > io_blocktime))
+            if (expect_false (io_blocktime))
-              sleeptime = io_blocktime;
-            if (sleeptime)
               {
+                sleeptime = io_blocktime - (mn_now - prev_mn_now);
+                if (sleeptime > waittime - backend_fudge)
+                  sleeptime = waittime - backend_fudge;
+                if (expect_true (sleeptime > 0.))
+                  {
-                ev_sleep (sleeptime);
+                    ev_sleep (sleeptime);
-                waittime -= sleeptime;
+                    waittime -= sleeptime;
+                  }
               }
           }
+#if EV_MINIMAL < 2
         ++loop_count;
+#endif
+        assert ((loop_done = EVUNLOOP_RECURSE, 1)); /* assert for side effect */
         backend_poll (EV_A_ waittime);
+        assert ((loop_done = EVUNLOOP_CANCEL, 1)); /* assert for side effect */
         /* update ev_rt_now, do magic */
         time_update (EV_A_ waittime + sleeptime);
       }
       /* queue check watchers, to be executed first */
       if (expect_false (checkcnt))
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
-      call_pending (EV_A);
+      EV_INVOKE_PENDING;
     }
   while (expect_true (
     activecnt
     && !loop_done
     && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
   ));
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;
+#if EV_MINIMAL < 2
+  --loop_depth;
+#endif
 }
 void
 ev_unloop (EV_P_ int how)
 {
   loop_done = how;
 }
+void
+ev_ref (EV_P)
+{
+  ++activecnt;
+}
+void
+ev_unref (EV_P)
+{
+  --activecnt;
+}
+void
+ev_now_update (EV_P)
+{
+  time_update (EV_A_ 1e100);
+}
+void
+ev_suspend (EV_P)
+{
+  ev_now_update (EV_A);
+}
+void
+ev_resume (EV_P)
+{
+  ev_tstamp mn_prev = mn_now;
+  ev_now_update (EV_A);
+  timers_reschedule (EV_A_ mn_now - mn_prev);
+#if EV_PERIODIC_ENABLE
+  /* TODO: really do this? */
+  periodics_reschedule (EV_A);
+#endif
+}
 /*****************************************************************************/
+/* singly-linked list management, used when the expected list length is short */
-void inline_size
+inline_size void
 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
-void inline_size
+inline_size void
 wlist_del (WL *head, WL elem)
 {
   while (*head)
     {
       if (*head == elem)
       head = &(*head)->next;
     }
 }
-void inline_speed
+/* internal, faster, version of ev_clear_pending */
+inline_speed void
 clear_pending (EV_P_ W w)
 {
   if (w->pending)
     {
-      pendings [ABSPRI (w)][w->pending - 1].w = 0;
+      pendings [ABSPRI (w)][w->pending - 1].w = (W)&pending_w;
       w->pending = 0;
     }
 }
 int
   int pending = w_->pending;
   if (expect_true (pending))
     {
       ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
+      p->w = (W)&pending_w;
       w_->pending = 0;
-      p->w = 0;
       return p->events;
     }
   else
     return 0;
 }
-void inline_size
+inline_size void
 pri_adjust (EV_P_ W w)
 {
-  int pri = w->priority;
+  int pri = ev_priority (w);
   pri = pri < EV_MINPRI ? EV_MINPRI : pri;
   pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
-  w->priority = pri;
+  ev_set_priority (w, pri);
 }
-void inline_speed
+inline_speed void
 ev_start (EV_P_ W w, int active)
 {
   pri_adjust (EV_A_ w);
   w->active = active;
   ev_ref (EV_A);
 }
-void inline_size
+inline_size void
 ev_stop (EV_P_ W w)
 {
   ev_unref (EV_A);
   w->active = 0;
 }
   int fd = w->fd;
   if (expect_false (ev_is_active (w)))
     return;
-  assert (("ev_io_start called with negative fd", fd >= 0));
+  assert (("libev: ev_io_start called with negative fd", fd >= 0));
+  assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, 1);
-  array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
+  array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
   wlist_add (&anfds[fd].head, (WL)w);
-  fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
+  fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
-  w->events &= ~EV_IOFDSET;
+  w->events &= ~EV__IOFDSET;
+  EV_FREQUENT_CHECK;
 }
 void noinline
 ev_io_stop (EV_P_ ev_io *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));
+  assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
+  EV_FREQUENT_CHECK;
   wlist_del (&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
   fd_change (EV_A_ w->fd, 1);
+  EV_FREQUENT_CHECK;
 }
 void noinline
 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
   ev_at (w) += mn_now;
-  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
+  assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
+  EV_FREQUENT_CHECK;
+  ++timercnt;
-  ev_start (EV_A_ (W)w, ++timercnt);
+  ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
-  array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
+  array_needsize (ANHE, timers, timermax, ev_active (w) + 1, EMPTY2);
-  timers [timercnt] = (WT)w;
+  ANHE_w (timers [ev_active (w)]) = (WT)w;
+  ANHE_at_cache (timers [ev_active (w)]);
-  upheap (timers, timercnt);
+  upheap (timers, ev_active (w));
+  EV_FREQUENT_CHECK;
-  /*assert (("internal timer heap corruption", timers [((W)w)->active] == w));*/
+  /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
 }
 void noinline
 ev_timer_stop (EV_P_ ev_timer *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
-  assert (("internal timer heap corruption", timers [((W)w)->active] == (WT)w));
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
+    assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
+    --timercnt;
-    if (expect_true (active < timercnt))
+    if (expect_true (active < timercnt + HEAP0))
       {
-        timers [active] = timers [timercnt];
+        timers [active] = timers [timercnt + HEAP0];
         adjustheap (timers, timercnt, active);
       }
-    --timercnt;
   }
+  EV_FREQUENT_CHECK;
   ev_at (w) -= mn_now;
   ev_stop (EV_A_ (W)w);
 }
 void noinline
 ev_timer_again (EV_P_ ev_timer *w)
 {
+  EV_FREQUENT_CHECK;
   if (ev_is_active (w))
     {
       if (w->repeat)
         {
           ev_at (w) = mn_now + w->repeat;
+          ANHE_at_cache (timers [ev_active (w)]);
-          adjustheap (timers, timercnt, ((W)w)->active);
+          adjustheap (timers, timercnt, ev_active (w));
         }
       else
         ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
     {
       ev_at (w) = w->repeat;
       ev_timer_start (EV_A_ w);
     }
+  EV_FREQUENT_CHECK;
+}
+ev_tstamp
+ev_timer_remaining (EV_P_ ev_timer *w)
+{
+  return ev_at (w) - (ev_is_active (w) ? mn_now : 0.);
 }
 #if EV_PERIODIC_ENABLE
 void noinline
 ev_periodic_start (EV_P_ ev_periodic *w)
   if (w->reschedule_cb)
     ev_at (w) = w->reschedule_cb (w, ev_rt_now);
   else if (w->interval)
     {
-      assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
+      assert (("libev: 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 */
       ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
     }
   else
     ev_at (w) = w->offset;
+  EV_FREQUENT_CHECK;
+  ++periodiccnt;
-  ev_start (EV_A_ (W)w, ++periodiccnt);
+  ev_start (EV_A_ (W)w, periodiccnt + HEAP0 - 1);
-  array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
+  array_needsize (ANHE, periodics, periodicmax, ev_active (w) + 1, EMPTY2);
-  periodics [periodiccnt] = (WT)w;
+  ANHE_w (periodics [ev_active (w)]) = (WT)w;
-  upheap (periodics, periodiccnt);
+  ANHE_at_cache (periodics [ev_active (w)]);
+  upheap (periodics, ev_active (w));
+  EV_FREQUENT_CHECK;
-  /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
+  /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
 }
 void noinline
 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
-  assert (("internal periodic heap corruption", periodics [((W)w)->active] == (WT)w));
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
+    assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
+    --periodiccnt;
-    if (expect_true (active < periodiccnt))
+    if (expect_true (active < periodiccnt + HEAP0))
       {
-        periodics [active] = periodics [periodiccnt];
+        periodics [active] = periodics [periodiccnt + HEAP0];
         adjustheap (periodics, periodiccnt, active);
       }
-    --periodiccnt;
   }
+  EV_FREQUENT_CHECK;
   ev_stop (EV_A_ (W)w);
 }
 void noinline
 void noinline
 ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY
-  assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
     return;
-  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+  assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
   evpipe_init (EV_A);
+  EV_FREQUENT_CHECK;
   {
 #ifndef _WIN32
     sigset_t full, prev;
     sigfillset (&full);
     sigprocmask (SIG_SETMASK, &full, &prev);
 #endif
-    array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+    array_needsize (ANSIG, signals, signalmax, w->signum, array_init_zero);
 #ifndef _WIN32
     sigprocmask (SIG_SETMASK, &prev, 0);
 #endif
   }
   if (!((WL)w)->next)
     {
 #if _WIN32
       signal (w->signum, ev_sighandler);
 #else
-      struct sigaction sa;
+      struct sigaction sa = { };
       sa.sa_handler = ev_sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);
 #endif
     }
+  EV_FREQUENT_CHECK;
 }
 void noinline
 ev_signal_stop (EV_P_ ev_signal *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   wlist_del (&signals [w->signum - 1].head, (WL)w);
   ev_stop (EV_A_ (W)w);
   if (!signals [w->signum - 1].head)
     signal (w->signum, SIG_DFL);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_child_start (EV_P_ ev_child *w)
 {
 #if EV_MULTIPLICITY
-  assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
+  assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, 1);
   wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_child_stop (EV_P_ ev_child *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 #if EV_STAT_ENABLE
 # ifdef _WIN32
 #  undef lstat
 #  define lstat(a,b) _stati64 (a,b)
 # endif
-#define DEF_STAT_INTERVAL 5.0074891
+#define DEF_STAT_INTERVAL  5.0074891
+#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
-#define MIN_STAT_INTERVAL 0.1074891
+#define MIN_STAT_INTERVAL  0.1074891
 static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
 #if EV_USE_INOTIFY
 # define EV_INOTIFY_BUFSIZE 8192
 {
   w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
   if (w->wd < 0)
     {
+      w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
-      ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
+      ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
       /* monitor some parent directory for speedup hints */
+      /* note that exceeding the hardcoded path limit is not a correctness issue, */
+      /* but an efficiency issue only */
       if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
         {
           char path [4096];
           strcpy (path, w->path);
               int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
                        | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
               char *pend = strrchr (path, '/');
-              if (!pend)
+              if (!pend || pend == path)
-                break; /* whoops, no '/', complain to your admin */
+                break;
               *pend = 0;
               w->wd = inotify_add_watch (fs_fd, path, mask);
             }
           while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
         }
     }
-  else
-    ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
   if (w->wd >= 0)
+    {
-    wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
+      wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
+      /* now local changes will be tracked by inotify, but remote changes won't */
+      /* unless the filesystem it known to be local, we therefore still poll */
+      /* also do poll on <2.6.25, but with normal frequency */
+      struct statfs sfs;
+      if (fs_2625 && !statfs (w->path, &sfs))
+        if (sfs.f_type == 0x1373 /* devfs */
+            || sfs.f_type == 0xEF53 /* ext2/3 */
+            || sfs.f_type == 0x3153464a /* jfs */
+            || sfs.f_type == 0x52654973 /* reiser3 */
+            || sfs.f_type == 0x01021994 /* tempfs */
+            || sfs.f_type == 0x58465342 /* xfs */)
+          return;
+      w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
+      ev_timer_again (EV_A_ &w->timer);
+    }
 }
 static void noinline
 infy_del (EV_P_ ev_stat *w)
 {
 static void noinline
 infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
 {
   if (slot < 0)
-    /* overflow, need to check for all hahs slots */
+    /* overflow, need to check for all hash slots */
     for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
       infy_wd (EV_A_ slot, wd, ev);
   else
     {
       WL w_;
           if (w->wd == wd || wd == -1)
             {
               if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
                 {
+                  wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
                   w->wd = -1;
                   infy_add (EV_A_ w); /* re-add, no matter what */
                 }
               stat_timer_cb (EV_A_ &w->timer, 0);
   for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
     infy_wd (EV_A_ ev->wd, ev->wd, ev);
 }
-void inline_size
+inline_size void
+check_2625 (EV_P)
+{
+  /* kernels < 2.6.25 are borked
+   * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
+   */
+  struct utsname buf;
+  int major, minor, micro;
+  if (uname (&buf))
+    return;
+  if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
+    return;
+  if (major < 2
+      || (major == 2 && minor < 6)
+      || (major == 2 && minor == 6 && micro < 25))
+    return;
+  fs_2625 = 1;
+}
+inline_size void
 infy_init (EV_P)
 {
   if (fs_fd != -2)
     return;
+  fs_fd = -1;
+  check_2625 (EV_A);
   fs_fd = inotify_init ();
   if (fs_fd >= 0)
     {
       ev_set_priority (&fs_w, EV_MAXPRI);
       ev_io_start (EV_A_ &fs_w);
     }
 }
-void inline_size
+inline_size void
 infy_fork (EV_P)
 {
   int slot;
   if (fs_fd < 0)
           w->wd = -1;
           if (fs_fd >= 0)
             infy_add (EV_A_ w); /* re-add, no matter what */
           else
-            ev_timer_start (EV_A_ &w->timer);
+            ev_timer_again (EV_A_ &w->timer);
         }
     }
 }
+#endif
+#ifdef _WIN32
+# define EV_LSTAT(p,b) _stati64 (p, b)
+#else
+# define EV_LSTAT(p,b) lstat (p, b)
 #endif
 void
 ev_stat_stat (EV_P_ ev_stat *w)
 {
     || w->prev.st_atime != w->attr.st_atime
     || w->prev.st_mtime != w->attr.st_mtime
     || w->prev.st_ctime != w->attr.st_ctime
   ) {
       #if EV_USE_INOTIFY
+        if (fs_fd >= 0)
+          {
-        infy_del (EV_A_ w);
+            infy_del (EV_A_ w);
-        infy_add (EV_A_ w);
+            infy_add (EV_A_ w);
-        ev_stat_stat (EV_A_ w); /* avoid race... */
+            ev_stat_stat (EV_A_ w); /* avoid race... */
+          }
       #endif
       ev_feed_event (EV_A_ w, EV_STAT);
     }
 }
 ev_stat_start (EV_P_ ev_stat *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
-  /* since we use memcmp, we need to clear any padding data etc. */
-  memset (&w->prev, 0, sizeof (ev_statdata));
-  memset (&w->attr, 0, sizeof (ev_statdata));
   ev_stat_stat (EV_A_ w);
+  if (w->interval < MIN_STAT_INTERVAL && w->interval)
-  if (w->interval < MIN_STAT_INTERVAL)
+    w->interval = MIN_STAT_INTERVAL;
-    w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
-  ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
+  ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
   ev_set_priority (&w->timer, ev_priority (w));
 #if EV_USE_INOTIFY
   infy_init (EV_A);
   if (fs_fd >= 0)
     infy_add (EV_A_ w);
   else
 #endif
-    ev_timer_start (EV_A_ &w->timer);
+    ev_timer_again (EV_A_ &w->timer);
   ev_start (EV_A_ (W)w, 1);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_stat_stop (EV_P_ ev_stat *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
 #if EV_USE_INOTIFY
   infy_del (EV_A_ w);
 #endif
   ev_timer_stop (EV_A_ &w->timer);
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 #endif
 #if EV_IDLE_ENABLE
 void
 {
   if (expect_false (ev_is_active (w)))
     return;
   pri_adjust (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
   {
     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;
   }
+  EV_FREQUENT_CHECK;
 }
 void
 ev_idle_stop (EV_P_ ev_idle *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
     idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
-    ((W)idles [ABSPRI (w)][active - 1])->active = active;
+    ev_active (idles [ABSPRI (w)][active - 1]) = active;
     ev_stop (EV_A_ (W)w);
     --idleall;
   }
+  EV_FREQUENT_CHECK;
 }
 #endif
 void
 ev_prepare_start (EV_P_ ev_prepare *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, ++preparecnt);
   array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
   prepares [preparecnt - 1] = w;
+  EV_FREQUENT_CHECK;
 }
 void
 ev_prepare_stop (EV_P_ ev_prepare *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
     prepares [active - 1] = prepares [--preparecnt];
-    ((W)prepares [active - 1])->active = active;
+    ev_active (prepares [active - 1]) = active;
   }
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_check_start (EV_P_ ev_check *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, ++checkcnt);
   array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
   checks [checkcnt - 1] = w;
+  EV_FREQUENT_CHECK;
 }
 void
 ev_check_stop (EV_P_ ev_check *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
     checks [active - 1] = checks [--checkcnt];
-    ((W)checks [active - 1])->active = active;
+    ev_active (checks [active - 1]) = active;
   }
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 #if EV_EMBED_ENABLE
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
         ev_loop (EV_A_ EVLOOP_NONBLOCK);
       }
   }
 }
+static void
+embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
+{
+  ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
+  ev_embed_stop (EV_A_ w);
+  {
+    struct ev_loop *loop = w->other;
+    ev_loop_fork (EV_A);
+    ev_loop (EV_A_ EVLOOP_NONBLOCK);
+  }
+  ev_embed_start (EV_A_ w);
+}
 #if 0
 static void
 embed_idle_cb (EV_P_ ev_idle *idle, int revents)
 {
   ev_idle_stop (EV_A_ idle);
   if (expect_false (ev_is_active (w)))
     return;
   {
     struct ev_loop *loop = w->other;
-    assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
+    assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
     ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
   }
+  EV_FREQUENT_CHECK;
   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_fork_init (&w->fork, embed_fork_cb);
+  ev_fork_start (EV_A_ &w->fork);
   /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
   ev_start (EV_A_ (W)w, 1);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_embed_stop (EV_P_ ev_embed *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
-  ev_io_stop (EV_A_ &w->io);
+  ev_io_stop      (EV_A_ &w->io);
   ev_prepare_stop (EV_A_ &w->prepare);
+  ev_fork_stop    (EV_A_ &w->fork);
-  ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 #endif
 #if EV_FORK_ENABLE
 void
 ev_fork_start (EV_P_ ev_fork *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, ++forkcnt);
   array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
   forks [forkcnt - 1] = w;
+  EV_FREQUENT_CHECK;
 }
 void
 ev_fork_stop (EV_P_ ev_fork *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
     forks [active - 1] = forks [--forkcnt];
-    ((W)forks [active - 1])->active = active;
+    ev_active (forks [active - 1]) = active;
   }
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 #endif
 #if EV_ASYNC_ENABLE
 void
 {
   if (expect_false (ev_is_active (w)))
     return;
   evpipe_init (EV_A);
+  EV_FREQUENT_CHECK;
   ev_start (EV_A_ (W)w, ++asynccnt);
   array_needsize (ev_async *, asyncs, asyncmax, asynccnt, EMPTY2);
   asyncs [asynccnt - 1] = w;
+  EV_FREQUENT_CHECK;
 }
 void
 ev_async_stop (EV_P_ ev_async *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  EV_FREQUENT_CHECK;
   {
-    int active = ((W)w)->active;
+    int active = ev_active (w);
     asyncs [active - 1] = asyncs [--asynccnt];
-    ((W)asyncs [active - 1])->active = active;
+    ev_active (asyncs [active - 1]) = active;
   }
   ev_stop (EV_A_ (W)w);
+  EV_FREQUENT_CHECK;
 }
 void
 ev_async_send (EV_P_ ev_async *w)
 {
 once_cb (EV_P_ struct ev_once *once, int revents)
 {
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
-  ev_io_stop (EV_A_ &once->io);
+  ev_io_stop    (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);
   ev_free (once);
   cb (revents, arg);
 }
 static void
 once_cb_io (EV_P_ ev_io *w, int revents)
 {
-  once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+  struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io));
+  once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->to));
 }
 static void
 once_cb_to (EV_P_ ev_timer *w, int revents)
 {
-  once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
+  struct ev_once *once = (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to));
+  once_cb (EV_A_ once, revents | ev_clear_pending (EV_A_ &once->io));
 }
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {
       ev_timer_set (&once->to, timeout, 0.);
       ev_timer_start (EV_A_ &once->to);
     }
 }
+/*****************************************************************************/
+#if EV_WALK_ENABLE
+void
+ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
+{
+  int i, j;
+  ev_watcher_list *wl, *wn;
+  if (types & (EV_IO | EV_EMBED))
+    for (i = 0; i < anfdmax; ++i)
+      for (wl = anfds [i].head; wl; )
+        {
+          wn = wl->next;
+#if EV_EMBED_ENABLE
+          if (ev_cb ((ev_io *)wl) == embed_io_cb)
+            {
+              if (types & EV_EMBED)
+                cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
+            }
+          else
+#endif
+#if EV_USE_INOTIFY
+          if (ev_cb ((ev_io *)wl) == infy_cb)
+            ;
+          else
+#endif
+          if ((ev_io *)wl != &pipe_w)
+            if (types & EV_IO)
+              cb (EV_A_ EV_IO, wl);
+          wl = wn;
+        }
+  if (types & (EV_TIMER | EV_STAT))
+    for (i = timercnt + HEAP0; i-- > HEAP0; )
+#if EV_STAT_ENABLE
+      /*TODO: timer is not always active*/
+      if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
+        {
+          if (types & EV_STAT)
+            cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
+        }
+      else
+#endif
+      if (types & EV_TIMER)
+        cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
+#if EV_PERIODIC_ENABLE
+  if (types & EV_PERIODIC)
+    for (i = periodiccnt + HEAP0; i-- > HEAP0; )
+      cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
+#endif
+#if EV_IDLE_ENABLE
+  if (types & EV_IDLE)
+    for (j = NUMPRI; i--; )
+      for (i = idlecnt [j]; i--; )
+        cb (EV_A_ EV_IDLE, idles [j][i]);
+#endif
+#if EV_FORK_ENABLE
+  if (types & EV_FORK)
+    for (i = forkcnt; i--; )
+      if (ev_cb (forks [i]) != embed_fork_cb)
+        cb (EV_A_ EV_FORK, forks [i]);
+#endif
+#if EV_ASYNC_ENABLE
+  if (types & EV_ASYNC)
+    for (i = asynccnt; i--; )
+      cb (EV_A_ EV_ASYNC, asyncs [i]);
+#endif
+  if (types & EV_PREPARE)
+    for (i = preparecnt; i--; )
+#if EV_EMBED_ENABLE
+      if (ev_cb (prepares [i]) != embed_prepare_cb)
+#endif
+        cb (EV_A_ EV_PREPARE, prepares [i]);
+  if (types & EV_CHECK)
+    for (i = checkcnt; i--; )
+      cb (EV_A_ EV_CHECK, checks [i]);
+  if (types & EV_SIGNAL)
+    for (i = 0; i < signalmax; ++i)
+      for (wl = signals [i].head; wl; )
+        {
+          wn = wl->next;
+          cb (EV_A_ EV_SIGNAL, wl);
+          wl = wn;
+        }
+  if (types & EV_CHILD)
+    for (i = EV_PID_HASHSIZE; i--; )
+      for (wl = childs [i]; wl; )
+        {
+          wn = wl->next;
+          cb (EV_A_ EV_CHILD, wl);
+          wl = wn;
+        }
+/* EV_STAT     0x00001000 /* stat data changed */
+/* EV_EMBED    0x00010000 /* embedded event loop needs sweep */
+}
+#endif
 #if EV_MULTIPLICITY
   #include "ev_wrap.h"
 #endif
 #ifdef __cplusplus

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev.c (file contents): Revision 1.229 by root, Fri May 2 08:08:45 2008 UTC vs. Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.229 by root, Fri May 2 08:08:45 2008 UTC vs.
Revision 1.302 by root, Thu Jul 16 15:08:08 2009 UTC