add prepare watcher

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 889dfe63c76b332a70969a581def965a09df23ec..9a6f785b6ca26723574e8ae528d3d51541bb13f8 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,5 +1,38 @@
+/*
+ * 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.
+ */
+

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

+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stddef.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -8,26 +41,32 @@
 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 

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

 #endif
 
 #endif
 

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

 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.
 
 #include "ev.h"
 
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.
 
 #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_time *WT;

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


@@ -39,6 +78,8 @@ static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
 static void (*method_modify)(int fd, int oev, int nev);
 static void (*method_poll)(ev_tstamp timeout);
 
 static void (*method_modify)(int fd, int oev, int nev);
 static void (*method_poll)(ev_tstamp timeout);
 

+/*****************************************************************************/
+

 ev_tstamp
 ev_time (void)
 {
 ev_tstamp
 ev_time (void)
 {


@@ -72,12 +113,13 @@ get_clock (void)
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \

-      fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, 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;                                    \
     }
 

+/*****************************************************************************/
+

 typedef struct
 {
   struct ev_io *head;
 typedef struct
 {
   struct ev_io *head;


@@ -103,7 +145,7 @@ anfds_init (ANFD *base, int count)
 
 typedef struct
 {
 
 typedef struct
 {

-  struct ev_watcher *w;
+  W w;

   int events;
 } ANPENDING;
 
   int events;
 } ANPENDING;
 


@@ -111,12 +153,15 @@ static ANPENDING *pendings;
 static int pendingmax, pendingcnt;
 
 static void
 static int pendingmax, pendingcnt;
 
 static void

-event (struct ev_watcher *w, int events)
+event (W w, int events)

 {
 {

-  w->pending = ++pendingcnt;
-  array_needsize (pendings, pendingmax, pendingcnt, );
-  pendings [pendingcnt - 1].w      = w;
-  pendings [pendingcnt - 1].events = events;
+  if (w->active)
+    {
+      w->pending = ++pendingcnt;
+      array_needsize (pendings, pendingmax, pendingcnt, );
+      pendings [pendingcnt - 1].w      = w;
+      pendings [pendingcnt - 1].events = events;
+    }

 }
 
 static void
 }
 
 static void


@@ -130,20 +175,44 @@ fd_event (int fd, int events)
       int ev = w->events & events;
 
       if (ev)
       int ev = w->events & events;
 
       if (ev)

-        event ((struct ev_watcher *)w, ev);
+        event ((W)w, ev);

     }
 }
 
     }
 }
 

-static struct ev_timer **atimers;
-static int atimermax, atimercnt;
+static void
+queue_events (W *events, int eventcnt, int type)
+{
+  int i;
+
+  for (i = 0; i < eventcnt; ++i)
+    event (events [i], type);
+}
+
+/* called on EBADF to verify fds */
+static void
+fd_recheck ()
+{
+  int fd;
+
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].wev)
+      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+        while (anfds [fd].head)
+          evio_stop (anfds [fd].head);
+}

 
 

-static struct ev_timer **rtimers;
-static int rtimermax, rtimercnt;
+/*****************************************************************************/
+
+static struct ev_timer **timers;
+static int timermax, timercnt;
+
+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)
     {


@@ -158,9 +227,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))
     {


@@ -181,16 +250,90 @@ downheap (struct ev_timer **timers, int N, int k)
   timers [k]->active = k + 1;
 }
 
   timers [k]->active = k + 1;
 }
 

-static struct ev_signal **signals;
+/*****************************************************************************/
+
+typedef struct
+{
+  struct ev_signal *head;
+  sig_atomic_t gotsig;
+} ANSIG;
+
+static ANSIG *signals;

 static int signalmax;
 
 static int signalmax;
 

+static int sigpipe [2];
+static sig_atomic_t gotsig;
+static struct ev_io sigev;
+

 static void
 static void

-signals_init (struct ev_signal **base, int count)
+signals_init (ANSIG *base, int count)

 {
   while (count--)
 {
   while (count--)

-    *base++ = 0;
+    {
+      base->head   = 0;
+      base->gotsig = 0;
+      ++base;
+    }

 }
 
 }
 

+static void
+sighandler (int signum)
+{
+  signals [signum - 1].gotsig = 1;
+
+  if (!gotsig)
+    {
+      gotsig = 1;
+      write (sigpipe [1], &gotsig, 1);
+    }
+}
+
+static void
+sigcb (struct ev_io *iow, int revents)
+{
+  struct ev_signal *w;
+  int sig;
+
+  gotsig = 0;
+  read (sigpipe [0], &revents, 1);
+
+  for (sig = signalmax; sig--; )
+    if (signals [sig].gotsig)
+      {
+        signals [sig].gotsig = 0;
+
+        for (w = signals [sig].head; w; w = w->next)
+          event ((W)w, EV_SIGNAL);
+      }
+}
+
+static void
+siginit (void)
+{
+  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);
+
+  evio_set (&sigev, sigpipe [0], EV_READ);
+  evio_start (&sigev);
+}
+
+/*****************************************************************************/
+
+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;
+
+/*****************************************************************************/
+

 #if HAVE_EPOLL
 # include "ev_epoll.c"
 #endif
 #if HAVE_EPOLL
 # include "ev_epoll.c"
 #endif


@@ -212,25 +355,36 @@ int ev_init (int flags)
   now    = get_clock ();
   diff   = ev_now - now;
 
   now    = get_clock ();
   diff   = ev_now - now;
 

+  if (pipe (sigpipe))
+    return 0;
+
+  ev_method = EVMETHOD_NONE;

 #if HAVE_EPOLL
 #if HAVE_EPOLL

-  if (epoll_init (flags))
-    return ev_method;
+  if (ev_method == EVMETHOD_NONE) epoll_init (flags);

 #endif
 #if HAVE_SELECT
 #endif
 #if HAVE_SELECT

-  if (select_init (flags))
-    return ev_method;
+  if (ev_method == EVMETHOD_NONE) select_init (flags);

 #endif
 
 #endif
 

-  ev_method = EVMETHOD_NONE;
+  if (ev_method)
+    {
+      evw_init (&sigev, sigcb);
+      siginit ();
+    }
+

   return ev_method;
 }
 
   return ev_method;
 }
 

+/*****************************************************************************/
+

 void ev_prefork (void)
 {
 void ev_prefork (void)
 {

+  /* nop */

 }
 
 void ev_postfork_parent (void)
 {
 }
 
 void ev_postfork_parent (void)
 {

+  /* nop */

 }
 
 void ev_postfork_child (void)
 }
 
 void ev_postfork_child (void)


@@ -239,8 +393,16 @@ void ev_postfork_child (void)
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif

+
+  evio_stop (&sigev);
+  close (sigpipe [0]);
+  close (sigpipe [1]);
+  pipe (sigpipe);
+  siginit ();

 }
 
 }
 

+/*****************************************************************************/
+

 static void
 fd_reify (void)
 {
 static void
 fd_reify (void)
 {


@@ -270,11 +432,9 @@ fd_reify (void)
 static void
 call_pending ()
 {
 static void
 call_pending ()
 {

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

     {
     {

-      ANPENDING *p = pendings + i;
+      ANPENDING *p = pendings + --pendingcnt;

 
       if (p->w)
         {
 
       if (p->w)
         {


@@ -282,36 +442,72 @@ call_pending ()
           p->w->cb (p->w, p->events);
         }
     }
           p->w->cb (p->w, p->events);
         }
     }

-
-  pendingcnt = 0;

 }
 
 static void
 }
 
 static void

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

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

-          if (w->is_abs)
-            w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
-          else
-            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
+        evtimer_stop (w); /* nonrepeating: stop timer */
+    }
+}

 
 

-          assert (w->at > now);
+static void
+periodics_reify ()
+{
+  while (periodiccnt && periodics [0]->at <= ev_now)
+    {
+      struct ev_periodic *w = periodics [0];

 
 

-          downheap (timers, timercnt, 0);
+      /* first reschedule or stop timer */
+      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));
+          downheap ((WT *)periodics, periodiccnt, 0);

         }
       else
         }
       else

+        evperiodic_stop (w); /* nonrepeating: stop timer */
+
+      event ((W)w, EV_TIMEOUT);
+    }
+}
+
+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;
+
+          if (fabs (diff) >= 1e-4)
+            {
+              evperiodic_stop (w);
+              evperiodic_start (w);

 
 

-      event ((struct ev_watcher *)w, EV_TIMEOUT);
+              i = 0; /* restart loop, inefficient, but time jumps should be rare */
+            }
+        }

     }
 }
 
     }
 }
 


@@ -319,14 +515,14 @@ static void
 time_update ()
 {
   int i;
 time_update ()
 {
   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;


@@ -337,19 +533,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;
     }


@@ -360,29 +556,40 @@ int ev_loop_done;
 void ev_loop (int flags)
 {
   double block;
 void ev_loop (int flags)
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT;
+  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;

 
   do
     {
 
   do
     {

+      /* queue check watchers (and execute them) */
+      if (checkcnt)
+        {
+          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 */

-      if (flags & EVLOOP_NONBLOCK)
+
+      /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
+      ev_now = ev_time ();
+
+      if (flags & EVLOOP_NONBLOCK || idlecnt)

         block = 0.;
       else
         {
           block = MAX_BLOCKTIME;
 
         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;
             }
 


@@ -394,26 +601,37 @@ void ev_loop (int flags)
       /* update ev_now, do magic */
       time_update ();
 
       /* update ev_now, do magic */
       time_update ();
 

-      /* put pending timers into pendign queue and reschedule them */
-      /* absolute timers first */
-      timers_reify (atimers, atimercnt, ev_now);
-      /* relative timers second */
-      timers_reify (rtimers, rtimercnt, now);
+      /* queue pending timers and reschedule them */
+      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 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;

 }
 
 }
 

+/*****************************************************************************/
+

 static void
 static void

-wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem)
+wlist_add (WL *head, WL elem)

 {
   elem->next = *head;
   *head = elem;
 }
 
 static void
 {
   elem->next = *head;
   *head = elem;
 }
 
 static void

-wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem)
+wlist_del (WL *head, WL elem)

 {
   while (*head)
     {
 {
   while (*head)
     {


@@ -428,22 +646,29 @@ wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem)
 }
 
 static void
 }
 
 static void

-ev_start (struct ev_watcher *w, int active)
+ev_clear (W w)

 {
 {

-  w->pending = 0;
-  w->active = active;
+  if (w->pending)
+    {
+      pendings [w->pending - 1].w = 0;
+      w->pending = 0;
+    }

 }
 
 static void
 }
 
 static void

-ev_stop (struct ev_watcher *w)
+ev_start (W w, int active)

 {
 {

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

 
 

+static void
+ev_stop (W w)
+{

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

-  /* nop */

 }
 
 }
 

+/*****************************************************************************/
+

 void
 evio_start (struct ev_io *w)
 {
 void
 evio_start (struct ev_io *w)
 {


@@ -452,9 +677,9 @@ evio_start (struct ev_io *w)
 
   int fd = w->fd;
 
 
   int fd = w->fd;
 

-  ev_start ((struct ev_watcher *)w, 1);
+  ev_start ((W)w, 1);

   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);

-  wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w);
+  wlist_add ((WL *)&anfds[fd].head, (WL)w);

 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );


@@ -464,11 +689,12 @@ evio_start (struct ev_io *w)
 void
 evio_stop (struct ev_io *w)
 {
 void
 evio_stop (struct ev_io *w)
 {

+  ev_clear ((W)w);

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

-  wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w);
-  ev_stop ((struct ev_watcher *)w);
+  wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
+  ev_stop ((W)w);

 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );


@@ -481,53 +707,83 @@ evtimer_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;
+  w->at += now;

 
 

-      ev_start ((struct ev_watcher *)w, ++atimercnt);
-      array_needsize (atimers, atimermax, atimercnt, );
-      atimers [atimercnt - 1] = w;
-      upheap (atimers, atimercnt - 1);
-    }
-  else
-    {
-      w->at += now;
-
-      ev_start ((struct ev_watcher *)w, ++rtimercnt);
-      array_needsize (rtimers, rtimermax, rtimercnt, );
-      rtimers [rtimercnt - 1] = w;
-      upheap (rtimers, rtimercnt - 1);
-    }
+  assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));

 
 

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

 }
 
 void
 evtimer_stop (struct ev_timer *w)
 {
 }
 
 void
 evtimer_stop (struct ev_timer *w)
 {

+  ev_clear ((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
+evtimer_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
+        evtimer_stop (w);

     }
     }

+  else if (w->repeat)
+    evtimer_start (w);
+}
+
+void
+evperiodic_start (struct ev_periodic *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  assert (("periodic interval value less than zero not allowed", w->interval >= 0.));

 
 

-  ev_stop ((struct ev_watcher *)w);
+  /* 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
+evperiodic_stop (struct ev_periodic *w)
+{
+  ev_clear ((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
 }
 
 void


@@ -536,23 +792,164 @@ evsignal_start (struct ev_signal *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  ev_start ((struct ev_watcher *)w, 1);
+  ev_start ((W)w, 1);

   array_needsize (signals, signalmax, w->signum, signals_init);
   array_needsize (signals, signalmax, w->signum, signals_init);

-  wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w);
+  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
+
+  if (!w->next)
+    {
+      struct sigaction sa;
+      sa.sa_handler = sighandler;
+      sigfillset (&sa.sa_mask);
+      sa.sa_flags = 0;
+      sigaction (w->signum, &sa, 0);
+    }

 }
 
 void
 evsignal_stop (struct ev_signal *w)
 {
 }
 
 void
 evsignal_stop (struct ev_signal *w)
 {

+  ev_clear ((W)w);

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

-  wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w);
-  ev_stop ((struct ev_watcher *)w);
+  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
+  ev_stop ((W)w);
+
+  if (!signals [w->signum - 1].head)
+    signal (w->signum, SIG_DFL);
+}
+
+void evidle_start (struct ev_idle *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++idlecnt);
+  array_needsize (idles, idlemax, idlecnt, );
+  idles [idlecnt - 1] = w;
+}
+
+void evidle_stop (struct ev_idle *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  idles [w->active - 1] = idles [--idlecnt];
+  ev_stop ((W)w);
+}
+
+void evprepare_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 evprepare_stop (struct ev_prepare *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  prepares [w->active - 1] = prepares [--preparecnt];
+  ev_stop ((W)w);
+}
+
+void evcheck_start (struct ev_check *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++checkcnt);
+  array_needsize (checks, checkmax, checkcnt, );
+  checks [checkcnt - 1] = w;
+}
+
+void evcheck_stop (struct ev_check *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  checks [w->active - 1] = checks [--checkcnt];
+  ev_stop ((W)w);

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

-#if 1
+
+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;
+
+  evio_stop (&once->io);
+  evtimer_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, arg);
+  else
+    {
+      once->cb  = cb;
+      once->arg = arg;
+
+      evw_init (&once->io, once_cb_io);
+
+      if (fd >= 0)
+        {
+          evio_set (&once->io, fd, events);
+          evio_start (&once->io);
+        }
+
+      evw_init (&once->to, once_cb_to);
+
+      if (timeout >= 0.)
+        {
+          evtimer_set (&once->to, timeout, 0.);
+          evtimer_start (&once->to);
+        }
+    }
+}
+
+/*****************************************************************************/
+
+#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)


@@ -568,25 +965,37 @@ ocb (struct ev_timer *w, int revents)
   evtimer_start (w);
 }
 
   evtimer_start (w);
 }
 

-int main (void)
+static void
+scb (struct ev_signal *w, int revents)
+{
+  fprintf (stderr, "signal %x,%d\n", revents, w->signum);
+  evio_stop (&wio);
+  evio_start (&wio);
+}
+
+static void
+gcb (struct ev_signal *w, int revents)

 {
 {

-  struct ev_io sin;
+  fprintf (stderr, "generic %x\n", revents);
+
+}

 
 

+int main (void)
+{

   ev_init (0);
 
   ev_init (0);
 

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

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

-#if 1
+#if 0

   int i;
   for (i = 0; i < 10000; ++i)
     {
       struct ev_timer *w = t + i;
       evw_init (w, ocb, i);
   int 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_init_abs (w, ocb, drand48 (), 0.99775533);

       evtimer_start (w);
       if (drand48 () < 0.5)
         evtimer_stop (w);
       evtimer_start (w);
       if (drand48 () < 0.5)
         evtimer_stop (w);


@@ -594,10 +1003,21 @@ int main (void)
 #endif
 
   struct ev_timer t1;
 #endif
 
   struct ev_timer t1;

-  evw_init (&t1, ocb, 0);
-  evtimer_set_abs (&t1, 5, 10);
+  evtimer_init (&t1, ocb, 5, 10);

   evtimer_start (&t1);
 
   evtimer_start (&t1);
 

+  struct ev_signal sig;
+  evsignal_init (&sig, scb, SIGQUIT);
+  evsignal_start (&sig);
+
+  struct ev_check cw;
+  evcheck_init (&cw, gcb);
+  evcheck_start (&cw);
+
+  struct ev_idle iw;
+  evidle_init (&iw, gcb);
+  evidle_start (&iw);
+

   ev_loop (0);
 
   return 0;
   ev_loop (0);
 
   return 0;