*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 01b9df26a53cd527d6586ccc2284e648dca39e36..7995b34005258fadf4a96db371db620f17a8f822 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,49 +1,84 @@
+/*
+ * libev event processing core, watcher management
+ *
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>

+#include <stddef.h>

 
 #include <stdio.h>
 
 #include <assert.h>
 #include <errno.h>
 
 #include <stdio.h>
 
 #include <assert.h>
 #include <errno.h>

+#include <sys/types.h>
+#include <sys/wait.h>

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

-#ifndef HAVE_MONOTONIC
+#ifndef EV_USE_MONOTONIC

 # ifdef CLOCK_MONOTONIC
 # ifdef CLOCK_MONOTONIC

-#  define HAVE_MONOTONIC 1
+#  define EV_USE_MONOTONIC 1

 # endif
 #endif
 
 # endif
 #endif
 

-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
+#ifndef EV_USE_SELECT
+# define EV_USE_SELECT 1

 #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 CLOCK_REALTIME
+# define EV_USE_REALTIME 0
+#endif
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */

 #endif
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #endif
 
 #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 detetc time jumps) */
+#define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
+#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */

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

-struct ev_watcher {
-  EV_WATCHER (ev_watcher);
-};
-
-struct ev_watcher_list {
-  EV_WATCHER_LIST (ev_watcher_list);
-};
-

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

+typedef struct ev_watcher_time *WT;

 
 static ev_tstamp now, diff; /* monotonic clock */
 ev_tstamp ev_now;
 
 static ev_tstamp now, diff; /* monotonic clock */
 ev_tstamp ev_now;


@@ -60,7 +95,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;


@@ -74,7 +109,7 @@ ev_time (void)
 static ev_tstamp
 get_clock (void)
 {
 static ev_tstamp
 get_clock (void)
 {

-#if HAVE_MONOTONIC
+#if EV_USE_MONOTONIC

   if (have_monotonic)
     {
       struct timespec ts;
   if (have_monotonic)
     {
       struct timespec ts;


@@ -86,11 +121,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)              \
   if ((cnt) > cur)                                     \
     {                                                  \
 #define array_needsize(base,cur,cnt,init)              \
   if ((cnt) > cur)                                     \
     {                                                  \

-      int newcnt = cur ? cur << 1 : 16;                        \
-      fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
+      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;                                    \


@@ -101,22 +143,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;
     }
 }


@@ -133,12 +175,27 @@ static int pendingmax, pendingcnt;
 static void
 event (W w, int events)
 {
 static void
 event (W w, int events)
 {

+  if (w->pending)
+    {
+      pendings [w->pending - 1].events |= events;
+      return;
+    }
+

   w->pending = ++pendingcnt;
   array_needsize (pendings, pendingmax, pendingcnt, );
   pendings [pendingcnt - 1].w      = w;
   pendings [pendingcnt - 1].events = events;
 }
 
   w->pending = ++pendingcnt;
   array_needsize (pendings, pendingmax, pendingcnt, );
   pendings [pendingcnt - 1].w      = w;
   pendings [pendingcnt - 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
 fd_event (int fd, int events)
 {
 static void
 fd_event (int fd, int events)
 {


@@ -154,27 +211,80 @@ 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;
+}
+
+/* called on EBADF to verify fds */
+static void
+fd_recheck (void)
+{
+  int fd;
+
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].events)
+      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+        while (anfds [fd].head)
+          {
+            ev_io_stop (anfds [fd].head);
+            event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);
+          }

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

-static struct ev_timer **atimers;
-static int atimermax, atimercnt;
+static struct ev_timer **timers;
+static int timermax, timercnt;

 
 

-static struct ev_timer **rtimers;
-static int rtimermax, rtimercnt;
+static struct ev_periodic **periodics;
+static int periodicmax, periodiccnt;

 
 static void
 
 static void

-upheap (struct ev_timer **timers, int k)
+upheap (WT *timers, int k)

 {
 {

-  struct ev_timer *w = timers [k];
+  WT w = timers [k];

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


@@ -189,9 +299,9 @@ upheap (struct ev_timer **timers, int k)
 }
 
 static void
 }
 
 static void

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

 {
 {

-  struct ev_timer *w = timers [k];
+  WT w = timers [k];

 
   while (k < (N >> 1))
     {
 
   while (k < (N >> 1))
     {


@@ -217,14 +327,14 @@ downheap (struct ev_timer **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


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

+

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


@@ -246,7 +357,7 @@ sighandler (int signum)
   if (!gotsig)
     {
       gotsig = 1;
   if (!gotsig)
     {
       gotsig = 1;

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

     }
 }
 
     }
 }
 


@@ -256,8 +367,8 @@ sigcb (struct ev_io *iow, int revents)
   struct ev_signal *w;
   int sig;
 
   struct ev_signal *w;
   int sig;
 

-  gotsig = 0;

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

+  gotsig = 0;

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


@@ -279,8 +390,8 @@ siginit (void)
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
 
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
 

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

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


@@ -288,47 +399,92 @@ 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 WCONTINUED
+# define WCONTINUED 0
+#endif
+
+static void
+childcb (struct ev_signal *sw, int revents)
+{
+  struct ev_child *w;
+  int pid, status;
+
+  while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
+    for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
+      if (w->pid == pid || w->pid == -1)
+        {
+          w->status = status;
+          event ((W)w, EV_CHILD);
+        }
+}
+
+/*****************************************************************************/
+
+#if EV_USE_EPOLL

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

-#if HAVE_SELECT
+#if EV_USE_SELECT

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

+int
+ev_version_major (void)
+{
+  return EV_VERSION_MAJOR;
+}
+
+int
+ev_version_minor (void)
+{
+  return EV_VERSION_MINOR;
+}
+

 int ev_init (int flags)
 {
 int ev_init (int flags)
 {

-#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 ();
+      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);
+      ev_method = EVMETHOD_NONE;
+#if EV_USE_EPOLL
+      if (ev_method == EVMETHOD_NONE) epoll_init (flags);

 #endif
 #endif

-#if HAVE_SELECT
-  if (ev_method == EVMETHOD_NONE) select_init (flags);
+#if EV_USE_SELECT
+      if (ev_method == EVMETHOD_NONE) select_init (flags);

 #endif
 
 #endif
 

-  if (ev_method)
-    {
-      evw_init (&sigev, sigcb, 0);
-      siginit ();
+      if (ev_method)
+        {
+          ev_watcher_init (&sigev, sigcb);
+          siginit ();
+
+          ev_signal_init (&childev, childcb, SIGCHLD);
+          ev_signal_start (&childev);
+        }

     }
 
   return ev_method;
     }
 
   return ev_method;


@@ -336,22 +492,27 @@ int ev_init (int flags)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

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

 {
 {

+  /* nop */

 }
 
 }
 

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

 {
 {

+  /* 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);


@@ -361,91 +522,99 @@ void ev_postfork_child (void)
 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void

-fd_reify (void)
+call_pending (void)

 {
 {

-  int i;
-
-  for (i = 0; i < fdchangecnt; ++i)
+  while (pendingcnt)

     {
     {

-      int fd = fdchanges [i];
-      ANFD *anfd = anfds + fd;
-      struct ev_io *w;
-
-      int wev = 0;
+      ANPENDING *p = pendings + --pendingcnt;

 
 

-      for (w = anfd->head; w; w = w->next)
-        wev |= w->events;
-
-      if (anfd->wev != wev)
+      if (p->w)

         {
         {

-          method_modify (fd, anfd->wev, wev);
-          anfd->wev = wev;
+          p->w->pending = 0;
+          p->w->cb (p->w, p->events);

         }
     }
         }
     }

-
-  fdchangecnt = 0;

 }
 
 static void
 }
 
 static void

-call_pending ()
+timers_reify (void)

 {
 {

-  int i;
-
-  for (i = 0; i < pendingcnt; ++i)
+  while (timercnt && timers [0]->at <= now)

     {
     {

-      ANPENDING *p = pendings + i;
+      struct ev_timer *w = timers [0];

 
 

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

         {
         {

-          p->w->pending = 0;
-          p->w->cb (p->w, p->events);
+          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
+          w->at = now + w->repeat;
+          downheap ((WT *)timers, timercnt, 0);

         }
         }

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

 
 

-  pendingcnt = 0;
+      event ((W)w, EV_TIMEOUT);
+    }

 }
 
 static void
 }
 
 static void

-timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now)
+periodics_reify (void)

 {
 {

-  while (timercnt && timers [0]->at <= now)
+  while (periodiccnt && periodics [0]->at <= ev_now)

     {
     {

-      struct ev_timer *w = timers [0];
+      struct ev_periodic *w = periodics [0];

 
       /* first reschedule or stop timer */
 
       /* first reschedule or stop timer */

-      if (w->repeat)
+      if (w->interval)

         {
         {

-          if (w->is_abs)
-            w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
-          else
-            w->at = now + w->repeat;
-
-          assert (w->at > now);
-
-          downheap (timers, timercnt, 0);
+          w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
+          downheap ((WT *)periodics, periodiccnt, 0);

         }
       else
         }
       else

+        ev_periodic_stop (w); /* nonrepeating: stop timer */
+
+      event ((W)w, EV_PERIODIC);
+    }
+}
+
+static void
+periodics_reschedule (ev_tstamp diff)
+{
+  int i;
+
+  /* adjust periodics after time jump */
+  for (i = 0; i < periodiccnt; ++i)
+    {
+      struct ev_periodic *w = periodics [i];
+
+      if (w->interval)

         {
         {

-          evtimer_stop (w); /* nonrepeating: stop timer */
-          --timercnt; /* maybe pass by reference instead? */
-        }
+          ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;

 
 

-      event ((W)w, EV_TIMEOUT);
+          if (fabs (diff) >= 1e-4)
+            {
+              ev_periodic_stop (w);
+              ev_periodic_start (w);
+
+              i = 0; /* restart loop, inefficient, but time jumps should be rare */
+            }
+        }

     }
 }
 
 static void
     }
 }
 
 static void

-time_update ()
+time_update (void)

 {
   int i;
 {
   int i;

+

   ev_now = ev_time ();
 
   if (have_monotonic)
     {
       ev_tstamp odiff = diff;
 
   ev_now = ev_time ();
 
   if (have_monotonic)
     {
       ev_tstamp odiff = diff;
 

-      /* detecting time jumps is much more difficult */
-      for (i = 2; --i; ) /* loop a few times, before making important decisions */
+      for (i = 4; --i; ) /* loop a few times, before making important decisions */

         {
           now = get_clock ();
           diff = ev_now - now;
         {
           now = get_clock ();
           diff = ev_now - now;


@@ -456,19 +625,19 @@ time_update ()
           ev_now = ev_time ();
         }
 
           ev_now = ev_time ();
         }
 

-      /* time jump detected, reschedule atimers */
-      for (i = 0; i < atimercnt; ++i)
-        {
-          struct ev_timer *w = atimers [i];
-          w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
-        }
+      periodics_reschedule (diff - odiff);
+      /* no timer adjustment, as the monotonic clock doesn't jump */

     }
   else
     {
       if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
     }
   else
     {
       if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)

-        /* time jump detected, adjust rtimers */
-        for (i = 0; i < rtimercnt; ++i)
-          rtimers [i]->at += ev_now - now;
+        {
+          periodics_reschedule (ev_now - now);
+
+          /* adjust timers. this is easy, as the offset is the same for all */
+          for (i = 0; i < timercnt; ++i)
+            timers [i]->at += diff;
+        }

 
       now = ev_now;
     }
 
       now = ev_now;
     }


@@ -479,35 +648,41 @@ int ev_loop_done;
 void ev_loop (int flags)
 {
   double block;
 void ev_loop (int flags)
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT;
-
-  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 (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 clockor timers, but as we basically
+         always have timers, we just calculate it always */
+      ev_now = ev_time ();
+

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

-          if (rtimercnt)
+          if (timercnt)

             {
             {

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

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

-          if (atimercnt)
+          if (periodiccnt)

             {
             {

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

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


@@ -520,21 +695,23 @@ void ev_loop (int flags)
       time_update ();
 
       /* queue pending timers and reschedule them */
       time_update ();
 
       /* queue pending timers and reschedule them */

-      /* absolute timers first */
-      timers_reify (atimers, atimercnt, ev_now);
-      /* relative timers second */
-      timers_reify (rtimers, rtimercnt, now);
+      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 ();
     }
   while (!ev_loop_done);
 
       call_pending ();
     }
   while (!ev_loop_done);

+
+  if (ev_loop_done != 2)
+    ev_loop_done = 0;

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


@@ -561,117 +738,153 @@ wlist_del (WL *head, WL elem)
     }
 }
 
     }
 }
 

+static void
+ev_clear_pending (W w)
+{
+  if (w->pending)
+    {
+      pendings [w->pending - 1].w = 0;
+      w->pending = 0;
+    }
+}
+

 static void
 ev_start (W w, int active)
 {
 static void
 ev_start (W w, int active)
 {

-  w->pending = 0;

   w->active = active;
 }
 
 static void
 ev_stop (W w)
 {
   w->active = active;
 }
 
 static void
 ev_stop (W w)
 {

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

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

-  /* nop */

 }
 
 /*****************************************************************************/
 
 void
 }
 
 /*****************************************************************************/
 
 void

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

 {
   if (ev_is_active (w))
     return;
 
   int fd = w->fd;
 
 {
   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_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;
 
 {
   if (ev_is_active (w))
     return;
 

-  if (w->is_abs)
-    {
-      /* this formula differs from the one in timer_reify becuse we do not round up */
-      if (w->repeat)
-        w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
-
-      ev_start ((W)w, ++atimercnt);
-      array_needsize (atimers, atimermax, atimercnt, );
-      atimers [atimercnt - 1] = w;
-      upheap (atimers, atimercnt - 1);
-    }
-  else
-    {
-      w->at += now;
+  w->at += now;

 
 

-      ev_start ((W)w, ++rtimercnt);
-      array_needsize (rtimers, rtimermax, rtimercnt, );
-      rtimers [rtimercnt - 1] = w;
-      upheap (rtimers, rtimercnt - 1);
-    }
+  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));

 
 

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

 }
 
 void
 }
 
 void

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

 {
 {

+  ev_clear_pending ((W)w);

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

-  if (w->is_abs)
+  if (w->active < timercnt--)

     {
     {

-      if (w->active < atimercnt--)
-        {
-          atimers [w->active - 1] = atimers [atimercnt];
-          downheap (atimers, atimercnt, w->active - 1);
-        }
+      timers [w->active - 1] = timers [timercnt];
+      downheap ((WT *)timers, timercnt, w->active - 1);

     }
     }

-  else
+
+  w->at = w->repeat;
+
+  ev_stop ((W)w);
+}
+
+void
+ev_timer_again (struct ev_timer *w)
+{
+  if (ev_is_active (w))

     {
     {

-      if (w->active < rtimercnt--)
+      if (w->repeat)

         {
         {

-          rtimers [w->active - 1] = rtimers [rtimercnt];
-          downheap (rtimers, rtimercnt, w->active - 1);
+          w->at = now + w->repeat;
+          downheap ((WT *)timers, timercnt, w->active - 1);

         }
         }

+      else
+        ev_timer_stop (w);
+    }
+  else if (w->repeat)
+    ev_timer_start (w);
+}
+
+void
+ev_periodic_start (struct ev_periodic *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  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)
+    w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
+
+  ev_start ((W)w, ++periodiccnt);
+  array_needsize (periodics, periodicmax, periodiccnt, );
+  periodics [periodiccnt - 1] = w;
+  upheap ((WT *)periodics, periodiccnt - 1);
+}
+
+void
+ev_periodic_stop (struct ev_periodic *w)
+{
+  ev_clear_pending ((W)w);
+  if (!ev_is_active (w))
+    return;
+
+  if (w->active < periodiccnt--)
+    {
+      periodics [w->active - 1] = periodics [periodiccnt];
+      downheap ((WT *)periodics, periodiccnt, w->active - 1);

     }
 
   ev_stop ((W)w);
 }
 
 void
     }
 
   ev_stop ((W)w);
 }
 
 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);


@@ -687,8 +900,9 @@ evsignal_start (struct ev_signal *w)
 }
 
 void
 }
 
 void

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

 {
 {

+  ev_clear_pending ((W)w);

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


@@ -699,7 +913,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;


@@ -709,13 +924,41 @@ 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_pending ((W)w);
+  if (ev_is_active (w))
+    return;
+

   idles [w->active - 1] = idles [--idlecnt];
   ev_stop ((W)w);
 }
 
   idles [w->active - 1] = idles [--idlecnt];
   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;


@@ -725,16 +968,107 @@ 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_pending ((W)w);
+  if (ev_is_active (w))
+    return;
+

   checks [w->active - 1] = checks [--checkcnt];
   ev_stop ((W)w);
 }
 
   checks [w->active - 1] = checks [--checkcnt];
   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_io io;
+  struct ev_timer to;
+  void (*cb)(int revents, void *arg);
+  void *arg;
+};
+
+static void
+once_cb (struct ev_once *once, int revents)
+{
+  void (*cb)(int revents, void *arg) = once->cb;
+  void *arg = once->arg;
+
+  ev_io_stop (&once->io);
+  ev_timer_stop (&once->to);
+  free (once);
+
+  cb (revents, arg);
+}
+
+static void
+once_cb_io (struct ev_io *w, int revents)
+{
+  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+}
+
+static void
+once_cb_to (struct ev_timer *w, int revents)
+{
+  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
+}
+
+void
+ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
+{
+  struct ev_once *once = malloc (sizeof (struct ev_once));
+
+  if (!once)
+    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+  else
+    {
+      once->cb  = cb;
+      once->arg = arg;
+
+      ev_watcher_init (&once->io, once_cb_io);
+      if (fd >= 0)
+        {
+          ev_io_set (&once->io, fd, events);
+          ev_io_start (&once->io);
+        }
+
+      ev_watcher_init (&once->to, once_cb_to);
+      if (timeout >= 0.)
+        {
+          ev_timer_set (&once->to, timeout, 0.);
+          ev_timer_start (&once->to);
+        }
+    }
+}
+

 /*****************************************************************************/
 
 #if 0
 
 /*****************************************************************************/
 
 #if 0
 

+struct ev_io wio;
+

 static void
 sin_cb (struct ev_io *w, int revents)
 {
 static void
 sin_cb (struct ev_io *w, int revents)
 {


@@ -745,31 +1079,31 @@ 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);

+  ev_io_stop (&wio);
+  ev_io_start (&wio);

 }
 
 static void
 gcb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "generic %x\n", revents);
 }
 
 static void
 gcb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "generic %x\n", revents);

+

 }
 
 int main (void)
 {
 }
 
 int main (void)
 {

-  struct ev_io sin;
-

   ev_init (0);
 
   ev_init (0);
 

-  evw_init (&sin, sin_cb, 55);
-  evio_set (&sin, 0, EV_READ);
-  evio_start (&sin);
+  ev_io_init (&wio, sin_cb, 0, EV_READ);
+  ev_io_start (&wio);

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


@@ -778,31 +1112,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_set_abs (w, 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;

-  evw_init (&t1, ocb, 0);
-  evtimer_set_abs (&t1, 5, 10);
-  evtimer_start (&t1);
+  ev_timer_init (&t1, ocb, 5, 10);
+  ev_timer_start (&t1);

 
   struct ev_signal sig;
 
   struct ev_signal sig;

-  evw_init (&sig, scb, 65535);
-  evsignal_set (&sig, SIGQUIT);
-  evsignal_start (&sig);
+  ev_signal_init (&sig, scb, SIGQUIT);
+  ev_signal_start (&sig);

 
   struct ev_check cw;
 
   struct ev_check cw;

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

 
   struct ev_idle iw;
 
   struct ev_idle iw;

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

 
   ev_loop (0);
 
 
   ev_loop (0);