*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 246b38ff75b8aa5c13ac29249d8fcf3948fb807e..3e1e8b4c7ca40a029e43d7b35f924fac404a06ab 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev event processing core, watcher management
+ *

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


@@ -26,6 +28,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

+#if EV_USE_CONFIG_H
+# include "config.h"
+#endif

 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>


@@ -38,39 +43,79 @@
 
 #include <assert.h>
 #include <errno.h>
 
 #include <assert.h>
 #include <errno.h>

+#include <sys/types.h>
+#ifndef WIN32
+# include <sys/wait.h>
+#endif

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

-#define HAVE_EPOLL 1
+/**/
+
+#ifndef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 1
+#endif

 
 

-#ifndef HAVE_MONOTONIC
-# ifdef CLOCK_MONOTONIC
-#  define HAVE_MONOTONIC 1
-# endif
+#ifndef EV_USE_SELECT
+# define EV_USE_SELECT 1

 #endif
 
 #endif
 

-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
+#ifndef EV_USE_POLL
+# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */

 #endif
 
 #endif
 

-#ifndef HAVE_EPOLL
-# define HAVE_EPOLL 0
+#ifndef EV_USE_EPOLL
+# define EV_USE_EPOLL 0

 #endif
 
 #endif
 

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

 #endif
 
 #endif
 

+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 1
+#endif
+
+/**/
+
+#ifndef CLOCK_MONOTONIC
+# undef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 0
+#endif
+
+#ifndef CLOCK_REALTIME
+# undef EV_USE_REALTIME
+# define EV_USE_REALTIME 0
+#endif
+
+/**/
+

 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */

-#define MAX_BLOCKTIME 60.
+#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
+#define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
+/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */

 
 #include "ev.h"
 
 
 #include "ev.h"
 

+#if __GNUC__ >= 3
+# define expect(expr,value)         __builtin_expect ((expr),(value))
+# define inline                     inline
+#else
+# define expect(expr,value)         (expr)
+# define inline                     static
+#endif
+
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)
+
+#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define ABSPRI(w) ((w)->priority - EV_MINPRI)
+

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

-static ev_tstamp now, diff; /* monotonic clock */
+static ev_tstamp now_floor, now, diff; /* monotonic clock */

 ev_tstamp ev_now;
 int ev_method;
 
 ev_tstamp ev_now;
 int ev_method;
 


@@ -85,7 +130,7 @@ static void (*method_poll)(ev_tstamp timeout);
 ev_tstamp
 ev_time (void)
 {
 ev_tstamp
 ev_time (void)
 {

-#if HAVE_REALTIME
+#if EV_USE_REALTIME

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


@@ -99,8 +144,8 @@ ev_time (void)
 static ev_tstamp
 get_clock (void)
 {
 static ev_tstamp
 get_clock (void)
 {

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

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


@@ -111,10 +156,18 @@ get_clock (void)
   return ev_time ();
 }
 
   return ev_time ();
 }
 

+#define array_roundsize(base,n) ((n) | 4 & ~3)
+

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

-  if ((cnt) > cur)                                     \
+  if (expect_false ((cnt) > cur))                      \

     {                                                  \
     {                                                  \

-      int newcnt = cur ? cur << 1 : 16;                        \
+      int newcnt = cur;                                        \
+      do                                               \
+        {                                              \
+          newcnt = array_roundsize (base, newcnt << 1);        \
+        }                                              \
+      while ((cnt) > newcnt);                          \
+                                                       \

       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \
       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \


@@ -125,22 +178,22 @@ get_clock (void)
 typedef struct
 {
   struct ev_io *head;
 typedef struct
 {
   struct ev_io *head;

-  unsigned char wev, rev; /* want, received event set */
+  unsigned char events;
+  unsigned char reify;

 } ANFD;
 
 static ANFD *anfds;
 static int anfdmax;
 
 } ANFD;
 
 static ANFD *anfds;
 static int anfdmax;
 

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

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

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

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


@@ -151,19 +204,31 @@ typedef struct
   int events;
 } ANPENDING;
 
   int events;
 } ANPENDING;
 

-static ANPENDING *pendings;
-static int pendingmax, pendingcnt;
+static ANPENDING *pendings [NUMPRI];
+static int pendingmax [NUMPRI], pendingcnt [NUMPRI];

 
 static void
 event (W w, int events)
 {
 
 static void
 event (W w, int events)
 {

-  if (w->active)
+  if (w->pending)

     {
     {

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

     }
     }

+
+  w->pending = ++pendingcnt [ABSPRI (w)];
+  array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
+  pendings [ABSPRI (w)][w->pending - 1].w      = w;
+  pendings [ABSPRI (w)][w->pending - 1].events = events;
+}
+
+static void
+queue_events (W *events, int eventcnt, int type)
+{
+  int i;
+
+  for (i = 0; i < eventcnt; ++i)
+    event (events [i], type);

 }
 
 static void
 }
 
 static void


@@ -181,13 +246,90 @@ fd_event (int fd, int events)
     }
 }
 
     }
 }
 

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

 static void
 static void

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

 {
   int i;
 
 {
   int i;
 

-  for (i = 0; i < eventcnt; ++i)
-    event (events [i], type);
+  for (i = 0; i < fdchangecnt; ++i)
+    {
+      int fd = fdchanges [i];
+      ANFD *anfd = anfds + fd;
+      struct ev_io *w;
+
+      int events = 0;
+
+      for (w = anfd->head; w; w = w->next)
+        events |= w->events;
+
+      anfd->reify = 0;
+
+      if (anfd->events != events)
+        {
+          method_modify (fd, anfd->events, events);
+          anfd->events = events;
+        }
+    }
+
+  fdchangecnt = 0;
+}
+
+static void
+fd_change (int fd)
+{
+  if (anfds [fd].reify || fdchangecnt < 0)
+    return;
+
+  anfds [fd].reify = 1;
+
+  ++fdchangecnt;
+  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+  fdchanges [fdchangecnt - 1] = fd;
+}
+
+static void
+fd_kill (int fd)
+{
+  struct ev_io *w;
+
+  printf ("killing fd %d\n", fd);//D
+  while ((w = anfds [fd].head))
+    {
+      ev_io_stop (w);
+      event ((W)w, EV_ERROR | EV_READ | EV_WRITE);
+    }
+}
+
+/* called on EBADF to verify fds */
+static void
+fd_ebadf (void)
+{
+  int fd;
+
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].events)
+      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+        fd_kill (fd);
+}
+
+/* called on ENOMEM in select/poll to kill some fds and retry */
+static void
+fd_enomem (void)
+{
+  int fd = anfdmax;
+
+  while (fd--)
+    if (anfds [fd].events)
+      {
+        close (fd);
+        fd_kill (fd);
+        return;
+      }

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


@@ -244,14 +386,14 @@ downheap (WT *timers, int N, int k)
 typedef struct
 {
   struct ev_signal *head;
 typedef struct
 {
   struct ev_signal *head;

-  sig_atomic_t gotsig;
+  sig_atomic_t volatile gotsig;

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

-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;

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


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

+

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


@@ -272,8 +415,10 @@ sighandler (int signum)
 
   if (!gotsig)
     {
 
   if (!gotsig)
     {

+      int old_errno = errno;

       gotsig = 1;
       gotsig = 1;

-      write (sigpipe [1], &gotsig, 1);
+      write (sigpipe [1], &signum, 1);
+      errno = old_errno;

     }
 }
 
     }
 }
 


@@ -281,17 +426,17 @@ static void
 sigcb (struct ev_io *iow, int revents)
 {
   struct ev_signal *w;
 sigcb (struct ev_io *iow, int revents)
 {
   struct ev_signal *w;

-  int sig;
+  int signum;

 
 

-  gotsig = 0;

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

+  gotsig = 0;

 
 

-  for (sig = signalmax; sig--; )
-    if (signals [sig].gotsig)
+  for (signum = signalmax; signum--; )
+    if (signals [signum].gotsig)

       {
       {

-        signals [sig].gotsig = 0;
+        signals [signum].gotsig = 0;

 
 

-        for (w = signals [sig].head; w; w = w->next)
+        for (w = signals [signum].head; w; w = w->next)

           event ((W)w, EV_SIGNAL);
       }
 }
           event ((W)w, EV_SIGNAL);
       }
 }


@@ -299,15 +444,17 @@ sigcb (struct ev_io *iow, int revents)
 static void
 siginit (void)
 {
 static void
 siginit (void)
 {

+#ifndef WIN32

   fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
 
   /* rather than sort out wether we really need nb, set it */
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
 
   /* rather than sort out wether we really need nb, set it */
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);

+#endif

 
 

-  evio_set (&sigev, sigpipe [0], EV_READ);
-  evio_start (&sigev);
+  ev_io_set (&sigev, sigpipe [0], EV_READ);
+  ev_io_start (&sigev);

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


@@ -315,47 +462,148 @@ siginit (void)
 static struct ev_idle **idles;
 static int idlemax, idlecnt;
 
 static struct ev_idle **idles;
 static int idlemax, idlecnt;
 

+static struct ev_prepare **prepares;
+static int preparemax, preparecnt;
+

 static struct ev_check **checks;
 static int checkmax, checkcnt;
 
 /*****************************************************************************/
 
 static struct ev_check **checks;
 static int checkmax, checkcnt;
 
 /*****************************************************************************/
 

-#if HAVE_EPOLL
+static struct ev_child *childs [PID_HASHSIZE];
+static struct ev_signal childev;
+
+#ifndef WIN32
+
+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
+
+static void
+child_reap (struct ev_signal *sw, int chain, int pid, int status)
+{
+  struct ev_child *w;
+
+  for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
+    if (w->pid == pid || !w->pid)
+      {
+        w->priority = sw->priority; /* need to do it *now* */
+        w->rpid     = pid;
+        w->rstatus  = status;
+        printf ("rpid %p %d %d\n", w, pid, w->pid);//D
+        event ((W)w, EV_CHILD);
+      }
+}
+
+static void
+childcb (struct ev_signal *sw, int revents)
+{
+  int pid, status;
+
+            printf ("chld %x\n", revents);//D
+  if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
+    {
+      /* make sure we are called again until all childs have been reaped */
+      event ((W)sw, EV_SIGNAL);
+
+      child_reap (sw, pid, pid, status);
+      child_reap (sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */
+    }
+}
+
+#endif
+
+/*****************************************************************************/
+
+#if EV_USE_KQUEUE
+# include "ev_kqueue.c"
+#endif
+#if EV_USE_EPOLL

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

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

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

-int ev_init (int flags)
+int
+ev_version_major (void)
+{
+  return EV_VERSION_MAJOR;
+}
+
+int
+ev_version_minor (void)
+{
+  return EV_VERSION_MINOR;
+}
+
+/* return true if we are running with elevated privileges and should ignore env variables */
+static int
+enable_secure ()
+{
+#ifdef WIN32
+  return 0;
+#else
+  return getuid () != geteuid ()
+      || getgid () != getegid ();
+#endif
+}
+
+int ev_init (int methods)

 {
 {

-#if HAVE_MONOTONIC
-  {
-    struct timespec ts;
-    if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-      have_monotonic = 1;
-  }
+  if (!ev_method)
+    {
+#if EV_USE_MONOTONIC
+      {
+        struct timespec ts;
+        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          have_monotonic = 1;
+      }

 #endif
 
 #endif
 

-  ev_now = ev_time ();
-  now    = get_clock ();
-  diff   = ev_now - now;
+      ev_now    = ev_time ();
+      now       = get_clock ();
+      now_floor = now;
+      diff      = ev_now - now;

 
 

-  if (pipe (sigpipe))
-    return 0;
+      if (pipe (sigpipe))
+        return 0;

 
 

-  ev_method = EVMETHOD_NONE;
-#if HAVE_EPOLL
-  if (ev_method == EVMETHOD_NONE) epoll_init (flags);
+      if (methods == EVMETHOD_AUTO)
+          if (!enable_secure () && getenv ("LIBEV_METHODS"))
+            methods = atoi (getenv ("LIBEV_METHODS"));
+          else
+            methods = EVMETHOD_ANY;
+
+      ev_method = 0;
+#if EV_USE_KQUEUE
+      if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
+#endif
+#if EV_USE_EPOLL
+      if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init  (methods);

 #endif
 #endif

-#if HAVE_SELECT
-  if (ev_method == EVMETHOD_NONE) select_init (flags);
+#if EV_USE_POLL
+      if (!ev_method && (methods & EVMETHOD_POLL  )) poll_init   (methods);
+#endif
+#if EV_USE_SELECT
+      if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);

 #endif
 
 #endif
 

-  if (ev_method)
-    {
-      evw_init (&sigev, sigcb);
-      siginit ();
+      if (ev_method)
+        {
+          ev_watcher_init (&sigev, sigcb);
+          ev_set_priority (&sigev, EV_MAXPRI);
+          siginit ();
+
+#ifndef WIN32
+          ev_signal_init (&childev, childcb, SIGCHLD);
+          ev_set_priority (&childev, EV_MAXPRI);
+          ev_signal_start (&childev);
+#endif
+        }

     }
 
   return ev_method;
     }
 
   return ev_method;


@@ -363,24 +611,27 @@ int ev_init (int flags)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-void ev_prefork (void)
+void
+ev_fork_prepare (void)

 {
   /* nop */
 }
 
 {
   /* nop */
 }
 

-void ev_postfork_parent (void)
+void
+ev_fork_parent (void)

 {
   /* nop */
 }
 
 {
   /* nop */
 }
 

-void ev_postfork_child (void)
+void
+ev_fork_child (void)

 {
 {

-#if HAVE_EPOLL
+#if EV_USE_EPOLL

   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
 
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
 

-  evio_stop (&sigev);
+  ev_io_stop (&sigev);

   close (sigpipe [0]);
   close (sigpipe [1]);
   pipe (sigpipe);
   close (sigpipe [0]);
   close (sigpipe [1]);
   pipe (sigpipe);


@@ -390,69 +641,46 @@ void ev_postfork_child (void)
 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void

-fd_reify (void)
+call_pending (void)

 {
 {

-  int i;
-
-  for (i = 0; i < fdchangecnt; ++i)
-    {
-      int fd = fdchanges [i];
-      ANFD *anfd = anfds + fd;
-      struct ev_io *w;
-
-      int wev = 0;
-
-      for (w = anfd->head; w; w = w->next)
-        wev |= w->events;
-
-      if (anfd->wev != wev)
-        {
-          method_modify (fd, anfd->wev, wev);
-          anfd->wev = wev;
-        }
-    }
-
-  fdchangecnt = 0;
-}
+  int pri;

 
 

-static void
-call_pending ()
-{
-  while (pendingcnt)
-    {
-      ANPENDING *p = pendings + --pendingcnt;
+  for (pri = NUMPRI; pri--; )
+    while (pendingcnt [pri])
+      {
+        ANPENDING *p = pendings [pri] + --pendingcnt [pri];

 
 

-      if (p->w)
-        {
-          p->w->pending = 0;
-          p->w->cb (p->w, p->events);
-        }
-    }
+        if (p->w)
+          {
+            p->w->pending = 0;
+            p->w->cb (p->w, p->events);
+          }
+      }

 }
 
 static void
 }
 
 static void

-timers_reify ()
+timers_reify (void)

 {
   while (timercnt && timers [0]->at <= now)
     {
       struct ev_timer *w = timers [0];
 
 {
   while (timercnt && timers [0]->at <= now)
     {
       struct ev_timer *w = timers [0];
 

-      event ((W)w, EV_TIMEOUT);
-

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

+          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));

           w->at = now + w->repeat;
           w->at = now + w->repeat;

-          assert (("timer timeout in the past, negative repeat?", w->at > now));

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

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

     }
 }
 
 static void
     }
 }
 
 static void

-periodics_reify ()
+periodics_reify (void)

 {
   while (periodiccnt && periodics [0]->at <= ev_now)
     {
 {
   while (periodiccnt && periodics [0]->at <= ev_now)
     {


@@ -462,13 +690,13 @@ periodics_reify ()
       if (w->interval)
         {
           w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
       if (w->interval)
         {
           w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;

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

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else

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

 
 

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

     }
 }
 
     }
 }
 


@@ -488,8 +716,8 @@ periodics_reschedule (ev_tstamp diff)
 
           if (fabs (diff) >= 1e-4)
             {
 
           if (fabs (diff) >= 1e-4)
             {

-              evperiodic_stop (w);
-              evperiodic_start (w);
+              ev_periodic_stop (w);
+              ev_periodic_start (w);

 
               i = 0; /* restart loop, inefficient, but time jumps should be rare */
             }
 
               i = 0; /* restart loop, inefficient, but time jumps should be rare */
             }


@@ -497,34 +725,58 @@ periodics_reschedule (ev_tstamp diff)
     }
 }
 
     }
 }
 

+static int
+time_update_monotonic (void)
+{
+  now = get_clock ();
+
+  if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
+    {
+      ev_now = now + diff;
+      return 0;
+    }
+  else
+    {
+      now_floor = now;
+      ev_now = ev_time ();
+      return 1;
+    }
+}
+

 static void
 static void

-time_update ()
+time_update (void)

 {
   int i;
 
 {
   int i;
 

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

     {
     {

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

         {
         {

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

 
 

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

 
 

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

 
 

-      periodics_reschedule (diff - odiff);
-      /* no timer adjustment, as the monotonic clock doesn't jump */
+              ev_now    = ev_time ();
+              now       = get_clock ();
+              now_floor = now;
+            }
+
+          periodics_reschedule (diff - odiff);
+          /* no timer adjustment, as the monotonic clock doesn't jump */
+        }

     }
   else
     }
   else

+#endif

     {
     {

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

         {
           periodics_reschedule (ev_now - now);
 
         {
           periodics_reschedule (ev_now - now);
 


@@ -542,23 +794,33 @@ int ev_loop_done;
 void ev_loop (int flags)
 {
   double block;
 void ev_loop (int flags)
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
-
-  if (checkcnt)
-    {
-      queue_events ((W *)checks, checkcnt, EV_CHECK);
-      call_pending ();
-    }
+  ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;

 
   do
     {
 
   do
     {

+      /* queue check watchers (and execute them) */
+      if (expect_false (preparecnt))
+        {
+          queue_events ((W *)prepares, preparecnt, EV_PREPARE);
+          call_pending ();
+        }
+

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

-      /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
-      ev_now = ev_time ();
+      /* we only need this for !monotonic clockor timers, but as we basically
+         always have timers, we just calculate it always */
+#if EV_USE_MONOTONIC
+      if (expect_true (have_monotonic))
+        time_update_monotonic ();
+      else
+#endif
+        {
+          ev_now = ev_time ();
+          now    = ev_now;
+        }

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


@@ -568,7 +830,7 @@ void ev_loop (int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

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

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


@@ -587,15 +849,16 @@ void ev_loop (int flags)
       time_update ();
 
       /* queue pending timers and reschedule them */
       time_update ();
 
       /* queue pending timers and reschedule them */

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

 
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)
         queue_events ((W *)idles, idlecnt, EV_IDLE);
 
 
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)
         queue_events ((W *)idles, idlecnt, EV_IDLE);
 

-      /* queue check and possibly idle watchers */
-      queue_events ((W *)checks, checkcnt, EV_CHECK);
+      /* queue check watchers, to be executed first */
+      if (checkcnt)
+        queue_events ((W *)checks, checkcnt, EV_CHECK);

 
       call_pending ();
     }
 
       call_pending ();
     }


@@ -630,11 +893,11 @@ wlist_del (WL *head, WL elem)
 }
 
 static void
 }
 
 static void

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

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

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

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


@@ -642,6 +905,9 @@ ev_clear (W w)
 static void
 ev_start (W w, int active)
 {
 static void
 ev_start (W w, int active)
 {

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

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


@@ -654,46 +920,44 @@ ev_stop (W w)
 /*****************************************************************************/
 
 void
 /*****************************************************************************/
 
 void

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

 {
 {

+  int fd = w->fd;
+

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

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

 
   ev_start ((W)w, 1);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
 
   ev_start ((W)w, 1);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 

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

 }
 
 void
 }
 
 void

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

 {
 {

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

   if (!ev_is_active (w))
     return;
 
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop ((W)w);
 
   if (!ev_is_active (w))
     return;
 
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop ((W)w);
 

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

 }
 
 void
 }
 
 void

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

 {
   if (ev_is_active (w))
     return;
 
   w->at += now;
 
 {
   if (ev_is_active (w))
     return;
 
   w->at += now;
 

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

 
   ev_start ((W)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );
 
   ev_start ((W)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );


@@ -702,9 +966,9 @@ evtimer_start (struct ev_timer *w)
 }
 
 void
 }
 
 void

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

 {
 {

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

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


@@ -720,7 +984,7 @@ evtimer_stop (struct ev_timer *w)
 }
 
 void
 }
 
 void

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

 {
   if (ev_is_active (w))
     {
 {
   if (ev_is_active (w))
     {


@@ -730,19 +994,19 @@ evtimer_again (struct ev_timer *w)
           downheap ((WT *)timers, timercnt, w->active - 1);
         }
       else
           downheap ((WT *)timers, timercnt, w->active - 1);
         }
       else

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

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

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

 }
 
 void
 }
 
 void

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

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

-  assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
+  assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));

 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)
 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)


@@ -755,9 +1019,9 @@ evperiodic_start (struct ev_periodic *w)
 }
 
 void
 }
 
 void

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

 {
 {

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

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


@@ -770,12 +1034,18 @@ evperiodic_stop (struct ev_periodic *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+

 void
 void

-evsignal_start (struct ev_signal *w)
+ev_signal_start (struct ev_signal *w)

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

+  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+

   ev_start ((W)w, 1);
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
   ev_start ((W)w, 1);
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);


@@ -785,15 +1055,15 @@ evsignal_start (struct ev_signal *w)
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);

-      sa.sa_flags = 0;
+      sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */

       sigaction (w->signum, &sa, 0);
     }
 }
 
 void
       sigaction (w->signum, &sa, 0);
     }
 }
 
 void

-evsignal_stop (struct ev_signal *w)
+ev_signal_stop (struct ev_signal *w)

 {
 {

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

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


@@ -804,7 +1074,8 @@ evsignal_stop (struct ev_signal *w)
     signal (w->signum, SIG_DFL);
 }
 
     signal (w->signum, SIG_DFL);
 }
 

-void evidle_start (struct ev_idle *w)
+void
+ev_idle_start (struct ev_idle *w)

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


@@ -814,9 +1085,10 @@ void evidle_start (struct ev_idle *w)
   idles [idlecnt - 1] = w;
 }
 
   idles [idlecnt - 1] = w;
 }
 

-void evidle_stop (struct ev_idle *w)
+void
+ev_idle_stop (struct ev_idle *w)

 {
 {

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

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


@@ -824,7 +1096,30 @@ void evidle_stop (struct ev_idle *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

-void evcheck_start (struct ev_check *w)
+void
+ev_prepare_start (struct ev_prepare *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++preparecnt);
+  array_needsize (prepares, preparemax, preparecnt, );
+  prepares [preparecnt - 1] = w;
+}
+
+void
+ev_prepare_stop (struct ev_prepare *w)
+{
+  ev_clear_pending ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  prepares [w->active - 1] = prepares [--preparecnt];
+  ev_stop ((W)w);
+}
+
+void
+ev_check_start (struct ev_check *w)

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


@@ -834,9 +1129,10 @@ void evcheck_start (struct ev_check *w)
   checks [checkcnt - 1] = w;
 }
 
   checks [checkcnt - 1] = w;
 }
 

-void evcheck_stop (struct ev_check *w)
+void
+ev_check_stop (struct ev_check *w)

 {
 {

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

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


@@ -844,6 +1140,27 @@ void evcheck_stop (struct ev_check *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

+void
+ev_child_start (struct ev_child *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, 1);
+  wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+}
+
+void
+ev_child_stop (struct ev_child *w)
+{
+  ev_clear_pending ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  ev_stop ((W)w);
+}
+

 /*****************************************************************************/
 
 struct ev_once
 /*****************************************************************************/
 
 struct ev_once


@@ -860,8 +1177,8 @@ once_cb (struct ev_once *once, int revents)
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 

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

   free (once);
 
   cb (revents, arg);
   free (once);
 
   cb (revents, arg);


@@ -885,26 +1202,24 @@ ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *ar
   struct ev_once *once = malloc (sizeof (struct ev_once));
 
   if (!once)
   struct ev_once *once = malloc (sizeof (struct ev_once));
 
   if (!once)

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

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

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

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

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

         }
 
         }
 

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

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

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

         }
     }
 }
         }
     }
 }


@@ -925,16 +1240,16 @@ static void
 ocb (struct ev_timer *w, int revents)
 {
   //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
 ocb (struct ev_timer *w, int revents)
 {
   //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);

-  evtimer_stop (w);
-  evtimer_start (w);
+  ev_timer_stop (w);
+  ev_timer_start (w);

 }
 
 static void
 scb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "signal %x,%d\n", revents, w->signum);
 }
 
 static void
 scb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "signal %x,%d\n", revents, w->signum);

-  evio_stop (&wio);
-  evio_start (&wio);
+  ev_io_stop (&wio);
+  ev_io_start (&wio);

 }
 
 static void
 }
 
 static void


@@ -948,8 +1263,8 @@ int main (void)
 {
   ev_init (0);
 
 {
   ev_init (0);
 

-  evio_init (&wio, sin_cb, 0, EV_READ);
-  evio_start (&wio);
+  ev_io_init (&wio, sin_cb, 0, EV_READ);
+  ev_io_start (&wio);

 
   struct ev_timer t[10000];
 
 
   struct ev_timer t[10000];
 


@@ -958,29 +1273,29 @@ int main (void)
   for (i = 0; i < 10000; ++i)
     {
       struct ev_timer *w = t + i;
   for (i = 0; i < 10000; ++i)
     {
       struct ev_timer *w = t + i;

-      evw_init (w, ocb, i);
-      evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
-      evtimer_start (w);
+      ev_watcher_init (w, ocb, i);
+      ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
+      ev_timer_start (w);

       if (drand48 () < 0.5)
       if (drand48 () < 0.5)

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

     }
 #endif
 
   struct ev_timer t1;
     }
 #endif
 
   struct ev_timer t1;

-  evtimer_init (&t1, ocb, 5, 10);
-  evtimer_start (&t1);
+  ev_timer_init (&t1, ocb, 5, 10);
+  ev_timer_start (&t1);

 
   struct ev_signal sig;
 
   struct ev_signal sig;

-  evsignal_init (&sig, scb, SIGQUIT);
-  evsignal_start (&sig);
+  ev_signal_init (&sig, scb, SIGQUIT);
+  ev_signal_start (&sig);

 
   struct ev_check cw;
 
   struct ev_check cw;

-  evcheck_init (&cw, gcb);
-  evcheck_start (&cw);
+  ev_check_init (&cw, gcb);
+  ev_check_start (&cw);

 
   struct ev_idle iw;
 
   struct ev_idle iw;

-  evidle_init (&iw, gcb);
-  evidle_start (&iw);
+  ev_idle_init (&iw, gcb);
+  ev_idle_start (&iw);

 
   ev_loop (0);
 
 
   ev_loop (0);