*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 7af2358439ad3ad71430462be444722035c46720..76dc021a3eee608ce9d2488fc929e021b3e10ff1 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -28,6 +28,11 @@
  * (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.
  */

+
+#ifdef __cplusplus
+extern "C" {
+#endif
+

 #ifndef EV_STANDALONE
 # include "config.h"
 
 #ifndef EV_STANDALONE
 # include "config.h"
 


@@ -48,7 +53,7 @@
 #  define EV_USE_EPOLL 1
 # endif
 
 #  define EV_USE_EPOLL 1
 # endif
 

-# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H

 #  define EV_USE_KQUEUE 1
 # endif
 
 #  define EV_USE_KQUEUE 1
 # endif
 


@@ -56,9 +61,7 @@
 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>

-#include <unistd.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <signal.h>

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


@@ -66,12 +69,15 @@
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>

+#include <time.h>
+
+#include <signal.h>
+

 #ifndef WIN32
 #ifndef WIN32

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

 # include <sys/wait.h>
 #endif
 # include <sys/wait.h>
 #endif

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

 /**/
 
 #ifndef EV_USE_MONOTONIC
 /**/
 
 #ifndef EV_USE_MONOTONIC


@@ -94,6 +100,16 @@
 # define EV_USE_KQUEUE 0
 #endif
 
 # define EV_USE_KQUEUE 0
 #endif
 

+#ifndef EV_USE_WIN32
+# ifdef WIN32
+#  define EV_USE_WIN32 0 /* it does not exist, use select */
+#  undef EV_USE_SELECT
+#  define EV_USE_SELECT 1
+# else
+#  define EV_USE_WIN32 0
+# endif
+#endif
+

 #ifndef EV_USE_REALTIME
 # define EV_USE_REALTIME 1
 #endif
 #ifndef EV_USE_REALTIME
 # define EV_USE_REALTIME 1
 #endif


@@ -117,7 +133,11 @@
 #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 */
 
 #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"
+#ifdef EV_H
+# include EV_H
+#else
+# include "ev.h"
+#endif

 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))


@@ -139,11 +159,61 @@ typedef struct ev_watcher_time *WT;
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 

+#include "ev_win32.c"
+
+/*****************************************************************************/
+
+static void (*syserr_cb)(const char *msg);
+
+void ev_set_syserr_cb (void (*cb)(const char *msg))
+{
+  syserr_cb = cb;
+}
+
+static void
+syserr (const char *msg)
+{
+  if (!msg)
+    msg = "(libev) system error";
+
+  if (syserr_cb)
+    syserr_cb (msg);
+  else
+    {
+      perror (msg);
+      abort ();
+    }
+}
+
+static void *(*alloc)(void *ptr, long size);
+
+void ev_set_allocator (void *(*cb)(void *ptr, long size))
+{
+  alloc = cb;
+}
+
+static void *
+ev_realloc (void *ptr, long size)
+{
+  ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
+
+  if (!ptr && size)
+    {
+      fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
+      abort ();
+    }
+
+  return ptr;
+}
+
+#define ev_malloc(size) ev_realloc (0, (size))
+#define ev_free(ptr)    ev_realloc ((ptr), 0)
+

 /*****************************************************************************/
 
 typedef struct
 {
 /*****************************************************************************/
 
 typedef struct
 {

-  struct ev_watcher_list *head;
+  WL head;

   unsigned char events;
   unsigned char reify;
 } ANFD;
   unsigned char events;
   unsigned char reify;
 } ANFD;


@@ -156,19 +226,26 @@ typedef struct
 
 #if EV_MULTIPLICITY
 
 
 #if EV_MULTIPLICITY
 

-struct ev_loop
-{
-# define VAR(name,decl) decl;
-# include "ev_vars.h"
-};
-# undef VAR
-# include "ev_wrap.h"
+  struct ev_loop
+  {
+    ev_tstamp ev_rt_now;
+    #define VAR(name,decl) decl;
+      #include "ev_vars.h"
+    #undef VAR
+  };
+  #include "ev_wrap.h"
+
+  struct ev_loop default_loop_struct;
+  static struct ev_loop *default_loop;

 
 #else
 
 
 #else
 

-# define VAR(name,decl) static decl;
-# include "ev_vars.h"
-# undef VAR
+  ev_tstamp ev_rt_now;
+  #define VAR(name,decl) static decl;
+    #include "ev_vars.h"
+  #undef VAR
+
+  static int default_loop;

 
 #endif
 
 
 #endif
 


@@ -203,29 +280,47 @@ get_clock (void)
   return ev_time ();
 }
 
   return ev_time ();
 }
 

+#if EV_MULTIPLICITY

 ev_tstamp
 ev_now (EV_P)
 {
 ev_tstamp
 ev_now (EV_P)
 {

-  return rt_now;
+  return ev_rt_now;

 }
 }

+#endif

 
 

-#define array_roundsize(base,n) ((n) | 4 & ~3)
+#define array_roundsize(type,n) ((n) | 4 & ~3)
+
+#define array_needsize(type,base,cur,cnt,init)                 \
+  if (expect_false ((cnt) > cur))                              \
+    {                                                          \
+      int newcnt = cur;                                                \
+      do                                                       \
+        {                                                      \
+          newcnt = array_roundsize (type, newcnt << 1);                \
+        }                                                      \
+      while ((cnt) > newcnt);                                  \
+                                                               \
+      base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
+      init (base + cur, newcnt - cur);                         \
+      cur = newcnt;                                            \
+    }

 
 

-#define array_needsize(base,cur,cnt,init)              \
-  if (expect_false ((cnt) > cur))                      \
-    {                                                  \
-      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;                                    \
+#define array_slim(type,stem)                                  \
+  if (stem ## max < array_roundsize (stem ## cnt >> 2))                \
+    {                                                          \
+      stem ## max = array_roundsize (stem ## cnt >> 1);                \
+      base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
+      fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\

     }
 
     }
 

+/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
+/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
+#define array_free_microshit(stem) \
+  ev_free (stem ## s); stem ## cnt = stem ## max = 0;
+
+#define array_free(stem, idx) \
+  ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
+

 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void


@@ -241,19 +336,21 @@ anfds_init (ANFD *base, int count)
     }
 }
 
     }
 }
 

-static void
-event (EV_P_ W w, int events)
+void
+ev_feed_event (EV_P_ void *w, int revents)

 {
 {

-  if (w->pending)
+  W w_ = (W)w;
+
+  if (w_->pending)

     {
     {

-      pendings [ABSPRI (w)][w->pending - 1].events |= events;
+      pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;

       return;
     }
 
       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;
+  w_->pending = ++pendingcnt [ABSPRI (w_)];
+  array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
+  pendings [ABSPRI (w_)][w_->pending - 1].w      = w_;
+  pendings [ABSPRI (w_)][w_->pending - 1].events = revents;

 }
 
 static void
 }
 
 static void


@@ -262,24 +359,30 @@ queue_events (EV_P_ W *events, int eventcnt, int type)
   int i;
 
   for (i = 0; i < eventcnt; ++i)
   int i;
 
   for (i = 0; i < eventcnt; ++i)

-    event (EV_A_ events [i], type);
+    ev_feed_event (EV_A_ events [i], type);

 }
 
 }
 

-static void
-fd_event (EV_P_ int fd, int events)
+inline void
+fd_event (EV_P_ int fd, int revents)

 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
 
   for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
     {
 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
 
   for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
     {

-      int ev = w->events & events;
+      int ev = w->events & revents;

 
       if (ev)
 
       if (ev)

-        event (EV_A_ (W)w, ev);
+        ev_feed_event (EV_A_ (W)w, ev);

     }
 }
 
     }
 }
 

+void
+ev_feed_fd_event (EV_P_ int fd, int revents)
+{
+  fd_event (EV_A_ fd, revents);
+}
+

 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void


@@ -300,11 +403,8 @@ fd_reify (EV_P)
 
       anfd->reify = 0;
 
 
       anfd->reify = 0;
 

-      if (anfd->events != events)
-        {
-          method_modify (EV_A_ fd, anfd->events, events);
-          anfd->events = events;
-        }
+      method_modify (EV_A_ fd, anfd->events, events);
+      anfd->events = events;

     }
 
   fdchangecnt = 0;
     }
 
   fdchangecnt = 0;


@@ -313,13 +413,13 @@ fd_reify (EV_P)
 static void
 fd_change (EV_P_ int fd)
 {
 static void
 fd_change (EV_P_ int fd)
 {

-  if (anfds [fd].reify || fdchangecnt < 0)
+  if (anfds [fd].reify)

     return;
 
   anfds [fd].reify = 1;
 
   ++fdchangecnt;
     return;
 
   anfds [fd].reify = 1;
 
   ++fdchangecnt;

-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));

   fdchanges [fdchangecnt - 1] = fd;
 }
 
   fdchanges [fdchangecnt - 1] = fd;
 }
 


@@ -331,10 +431,20 @@ fd_kill (EV_P_ int fd)
   while ((w = (struct ev_io *)anfds [fd].head))
     {
       ev_io_stop (EV_A_ w);
   while ((w = (struct ev_io *)anfds [fd].head))
     {
       ev_io_stop (EV_A_ w);

-      event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
+      ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);

     }
 }
 
     }
 }
 

+static int
+fd_valid (int fd)
+{
+#ifdef WIN32
+  return !!win32_get_osfhandle (fd);
+#else
+  return fcntl (fd, F_GETFD) != -1;
+#endif
+}
+

 /* called on EBADF to verify fds */
 static void
 fd_ebadf (EV_P)
 /* called on EBADF to verify fds */
 static void
 fd_ebadf (EV_P)


@@ -343,7 +453,7 @@ fd_ebadf (EV_P)
 
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
 
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)

-      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+      if (!fd_valid (fd) == -1 && errno == EBADF)

         fd_kill (EV_A_ fd);
 }
 
         fd_kill (EV_A_ fd);
 }
 


@@ -351,18 +461,17 @@ fd_ebadf (EV_P)
 static void
 fd_enomem (EV_P)
 {
 static void
 fd_enomem (EV_P)
 {

-  int fd = anfdmax;
+  int fd;

 
 

-  while (fd--)
+  for (fd = anfdmax; fd--; )

     if (anfds [fd].events)
       {
     if (anfds [fd].events)
       {

-        close (fd);

         fd_kill (EV_A_ fd);
         return;
       }
 }
 
         fd_kill (EV_A_ fd);
         return;
       }
 }
 

-/* susually called after fork if method needs to re-arm all fds from scratch */
+/* usually called after fork if method needs to re-arm all fds from scratch */

 static void
 fd_rearm_all (EV_P)
 {
 static void
 fd_rearm_all (EV_P)
 {


@@ -387,12 +496,12 @@ upheap (WT *heap, int k)
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];

-      heap [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;

       k >>= 1;
     }
 
   heap [k] = w;
       k >>= 1;
     }
 
   heap [k] = w;

-  heap [k]->active = k + 1;
+  ((W)heap [k])->active = k + 1;

 
 }
 
 
 }
 


@@ -412,19 +521,31 @@ downheap (WT *heap, int N, int k)
         break;
 
       heap [k] = heap [j];
         break;
 
       heap [k] = heap [j];

-      heap [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;

       k = j;
     }
 
   heap [k] = w;
       k = j;
     }
 
   heap [k] = w;

-  heap [k]->active = k + 1;
+  ((W)heap [k])->active = k + 1;
+}
+
+inline void
+adjustheap (WT *heap, int N, int k, ev_tstamp at)
+{
+  ev_tstamp old_at = heap [k]->at;
+  heap [k]->at = at;
+
+  if (old_at < at)
+    downheap (heap, N, k);
+  else
+    upheap (heap, k);

 }
 
 /*****************************************************************************/
 
 typedef struct
 {
 }
 
 /*****************************************************************************/
 
 typedef struct
 {

-  struct ev_watcher_list *head;
+  WL head;

   sig_atomic_t volatile gotsig;
 } ANSIG;
 
   sig_atomic_t volatile gotsig;
 } ANSIG;
 


@@ -450,34 +571,60 @@ signals_init (ANSIG *base, int count)
 static void
 sighandler (int signum)
 {
 static void
 sighandler (int signum)
 {

+#if WIN32
+  signal (signum, sighandler);
+#endif
+

   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)
     {
       int old_errno = errno;
       gotsig = 1;
   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)
     {
       int old_errno = errno;
       gotsig = 1;

+#ifdef WIN32
+      send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
+#else

       write (sigpipe [1], &signum, 1);
       write (sigpipe [1], &signum, 1);

+#endif

       errno = old_errno;
     }
 }
 
       errno = old_errno;
     }
 }
 

+void
+ev_feed_signal_event (EV_P_ int signum)
+{
+  WL w;
+
+#if EV_MULTIPLICITY
+  assert (("feeding signal events is only supported in the default loop", loop == default_loop));
+#endif
+
+  --signum;
+
+  if (signum < 0 || signum >= signalmax)
+    return;
+
+  signals [signum].gotsig = 0;
+
+  for (w = signals [signum].head; w; w = w->next)
+    ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
+}
+

 static void
 sigcb (EV_P_ struct ev_io *iow, int revents)
 {
 static void
 sigcb (EV_P_ struct ev_io *iow, int revents)
 {

-  struct ev_watcher_list *w;

   int signum;
 
   int signum;
 

+#ifdef WIN32
+  recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
+#else

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

+#endif

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

-      {
-        signals [signum].gotsig = 0;
-
-        for (w = signals [signum].head; w; w = w->next)
-          event (EV_A_ (W)w, EV_SIGNAL);
-      }
+      ev_feed_signal_event (EV_A_ signum + 1);

 }
 
 static void
 }
 
 static void


@@ -499,9 +646,10 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

+static struct ev_child *childs [PID_HASHSIZE];
+

 #ifndef WIN32
 
 #ifndef WIN32
 

-static struct ev_child *childs [PID_HASHSIZE];

 static struct ev_signal childev;
 
 #ifndef WCONTINUED
 static struct ev_signal childev;
 
 #ifndef WCONTINUED


@@ -516,10 +664,10 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {

-        w->priority = sw->priority; /* need to do it *now* */
-        w->rpid     = pid;
-        w->rstatus  = status;
-        event (EV_A_ (W)w, EV_CHILD);
+        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
+        w->rpid         = pid;
+        w->rstatus      = status;
+        ev_feed_event (EV_A_ (W)w, EV_CHILD);

       }
 }
 
       }
 }
 


@@ -531,7 +679,7 @@ childcb (EV_P_ struct ev_signal *sw, int revents)
   if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
     {
       /* make sure we are called again until all childs have been reaped */
   if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
     {
       /* make sure we are called again until all childs have been reaped */

-      event (EV_A_ (W)sw, EV_SIGNAL);
+      ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);

 
       child_reap (EV_A_ sw, pid, pid, status);
       child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */
 
       child_reap (EV_A_ sw, pid, pid, status);
       child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */


@@ -598,10 +746,10 @@ loop_init (EV_P_ int methods)
       }
 #endif
 
       }
 #endif
 

-      rt_now    = ev_time ();
+      ev_rt_now = ev_time ();

       mn_now    = get_clock ();
       now_floor = mn_now;
       mn_now    = get_clock ();
       now_floor = mn_now;

-      rtmn_diff = rt_now - mn_now;
+      rtmn_diff = ev_rt_now - mn_now;

 
       if (methods == EVMETHOD_AUTO)
         if (!enable_secure () && getenv ("LIBEV_METHODS"))
 
       if (methods == EVMETHOD_AUTO)
         if (!enable_secure () && getenv ("LIBEV_METHODS"))


@@ -610,6 +758,9 @@ loop_init (EV_P_ int methods)
           methods = EVMETHOD_ANY;
 
       method = 0;
           methods = EVMETHOD_ANY;
 
       method = 0;

+#if EV_USE_WIN32
+      if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init  (EV_A_ methods);
+#endif

 #if EV_USE_KQUEUE
       if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
 #endif
 #if EV_USE_KQUEUE
       if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
 #endif


@@ -622,12 +773,20 @@ loop_init (EV_P_ int methods)
 #if EV_USE_SELECT
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif
 #if EV_USE_SELECT
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif

+
+      ev_init (&sigev, sigcb);
+      ev_set_priority (&sigev, EV_MAXPRI);

     }
 }
 
 void
 loop_destroy (EV_P)
 {
     }
 }
 
 void
 loop_destroy (EV_P)
 {

+  int i;
+
+#if EV_USE_WIN32
+  if (method == EVMETHOD_WIN32 ) win32_destroy  (EV_A);
+#endif

 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif


@@ -641,27 +800,55 @@ loop_destroy (EV_P)
   if (method == EVMETHOD_SELECT) select_destroy (EV_A);
 #endif
 
   if (method == EVMETHOD_SELECT) select_destroy (EV_A);
 #endif
 

+  for (i = NUMPRI; i--; )
+    array_free (pending, [i]);
+
+  /* have to use the microsoft-never-gets-it-right macro */
+  array_free_microshit (fdchange);
+  array_free_microshit (timer);
+  array_free_microshit (periodic);
+  array_free_microshit (idle);
+  array_free_microshit (prepare);
+  array_free_microshit (check);
+

   method = 0;
   method = 0;

-  /*TODO*/

 }
 
 }
 

-void
+static void

 loop_fork (EV_P)
 {
 loop_fork (EV_P)
 {

-  /*TODO*/

 #if EV_USE_EPOLL
   if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
 #endif
 #if EV_USE_EPOLL
   if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
 #endif

+
+  if (ev_is_active (&sigev))
+    {
+      /* default loop */
+
+      ev_ref (EV_A);
+      ev_io_stop (EV_A_ &sigev);
+      close (sigpipe [0]);
+      close (sigpipe [1]);
+
+      while (pipe (sigpipe))
+        syserr ("(libev) error creating pipe");
+
+      siginit (EV_A);
+    }
+
+  postfork = 0;

 }
 
 #if EV_MULTIPLICITY
 struct ev_loop *
 ev_loop_new (int methods)
 {
 }
 
 #if EV_MULTIPLICITY
 struct ev_loop *
 ev_loop_new (int methods)
 {

-  struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
+  struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
+
+  memset (loop, 0, sizeof (struct ev_loop));

 
   loop_init (EV_A_ methods);
 
 
   loop_init (EV_A_ methods);
 


@@ -675,25 +862,20 @@ void
 ev_loop_destroy (EV_P)
 {
   loop_destroy (EV_A);
 ev_loop_destroy (EV_P)
 {
   loop_destroy (EV_A);

-  free (loop);
+  ev_free (loop);

 }
 
 void
 ev_loop_fork (EV_P)
 {
 }
 
 void
 ev_loop_fork (EV_P)
 {

-  loop_fork (EV_A);
+  postfork = 1;

 }
 
 #endif
 
 #if EV_MULTIPLICITY
 }
 
 #endif
 
 #if EV_MULTIPLICITY

-struct ev_loop default_loop_struct;
-static struct ev_loop *default_loop;
-

 struct ev_loop *
 #else
 struct ev_loop *
 #else

-static int default_loop;
-

 int
 #endif
 ev_default_loop (int methods)
 int
 #endif
 ev_default_loop (int methods)


@@ -714,8 +896,6 @@ ev_default_loop (int methods)
 
       if (ev_method (EV_A))
         {
 
       if (ev_method (EV_A))
         {

-          ev_watcher_init (&sigev, sigcb);
-          ev_set_priority (&sigev, EV_MAXPRI);

           siginit (EV_A);
 
 #ifndef WIN32
           siginit (EV_A);
 
 #ifndef WIN32


@@ -739,8 +919,10 @@ ev_default_destroy (void)
   struct ev_loop *loop = default_loop;
 #endif
 
   struct ev_loop *loop = default_loop;
 #endif
 

+#ifndef WIN32

   ev_ref (EV_A); /* child watcher */
   ev_signal_stop (EV_A_ &childev);
   ev_ref (EV_A); /* child watcher */
   ev_signal_stop (EV_A_ &childev);

+#endif

 
   ev_ref (EV_A); /* signal watcher */
   ev_io_stop (EV_A_ &sigev);
 
   ev_ref (EV_A); /* signal watcher */
   ev_io_stop (EV_A_ &sigev);


@@ -758,19 +940,24 @@ ev_default_fork (void)
   struct ev_loop *loop = default_loop;
 #endif
 
   struct ev_loop *loop = default_loop;
 #endif
 

-  loop_fork (EV_A);
-
-  ev_io_stop (EV_A_ &sigev);
-  close (sigpipe [0]);
-  close (sigpipe [1]);
-  pipe (sigpipe);
-
-  ev_ref (EV_A); /* signal watcher */
-  siginit (EV_A);
+  if (method)
+    postfork = 1;

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

+static int
+any_pending (EV_P)
+{
+  int pri;
+
+  for (pri = NUMPRI; pri--; )
+    if (pendingcnt [pri])
+      return 1;
+
+  return 0;
+}
+

 static void
 call_pending (EV_P)
 {
 static void
 call_pending (EV_P)
 {


@@ -784,7 +971,7 @@ call_pending (EV_P)
         if (p->w)
           {
             p->w->pending = 0;
         if (p->w)
           {
             p->w->pending = 0;

-            p->w->cb (EV_A_ p->w, p->events);
+            EV_CB_INVOKE (p->w, p->events);

           }
       }
 }
           }
       }
 }


@@ -792,42 +979,53 @@ call_pending (EV_P)
 static void
 timers_reify (EV_P)
 {
 static void
 timers_reify (EV_P)
 {

-  while (timercnt && timers [0]->at <= mn_now)
+  while (timercnt && ((WT)timers [0])->at <= mn_now)

     {
       struct ev_timer *w = timers [0];
 
     {
       struct ev_timer *w = timers [0];
 

+      assert (("inactive timer on timer heap detected", ev_is_active (w)));
+

       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));

-          w->at = mn_now + w->repeat;
+          ((WT)w)->at = mn_now + w->repeat;

           downheap ((WT *)timers, timercnt, 0);
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
 
           downheap ((WT *)timers, timercnt, 0);
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
 

-      event (EV_A_ (W)w, EV_TIMEOUT);
+      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);

     }
 }
 
 static void
 periodics_reify (EV_P)
 {
     }
 }
 
 static void
 periodics_reify (EV_P)
 {

-  while (periodiccnt && periodics [0]->at <= rt_now)
+  while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)

     {
       struct ev_periodic *w = periodics [0];
 
     {
       struct ev_periodic *w = periodics [0];
 

+      assert (("inactive timer on periodic heap detected", ev_is_active (w)));
+

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

-      if (w->interval)
+      if (w->reschedule_cb)
+        {
+          ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
+
+          assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
+          downheap ((WT *)periodics, periodiccnt, 0);
+        }
+      else if (w->interval)

         {
         {

-          w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
-          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
+          ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
 
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
 

-      event (EV_A_ (W)w, EV_PERIODIC);
+      ev_feed_event (EV_A_ (W)w, EV_PERIODIC);

     }
 }
 
     }
 }
 


@@ -841,19 +1039,15 @@ periodics_reschedule (EV_P)
     {
       struct ev_periodic *w = periodics [i];
 
     {
       struct ev_periodic *w = periodics [i];
 

-      if (w->interval)
-        {
-          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
-
-          if (fabs (diff) >= 1e-4)
-            {
-              ev_periodic_stop (EV_A_ w);
-              ev_periodic_start (EV_A_ w);
-
-              i = 0; /* restart loop, inefficient, but time jumps should be rare */
-            }
-        }
+      if (w->reschedule_cb)
+        ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
+      else if (w->interval)
+        ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;

     }
     }

+
+  /* now rebuild the heap */
+  for (i = periodiccnt >> 1; i--; )
+    downheap ((WT *)periodics, periodiccnt, i);

 }
 
 inline int
 }
 
 inline int


@@ -863,13 +1057,13 @@ time_update_monotonic (EV_P)
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {

-      rt_now = rtmn_diff + mn_now;
+      ev_rt_now = rtmn_diff + mn_now;

       return 0;
     }
   else
     {
       now_floor = mn_now;
       return 0;
     }
   else
     {
       now_floor = mn_now;

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

       return 1;
     }
 }
       return 1;
     }
 }


@@ -888,12 +1082,12 @@ time_update (EV_P)
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {

-              rtmn_diff = rt_now - mn_now;
+              rtmn_diff = ev_rt_now - mn_now;

 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 
 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 

-              rt_now    = ev_time ();
+              ev_rt_now = ev_time ();

               mn_now    = get_clock ();
               now_floor = mn_now;
             }
               mn_now    = get_clock ();
               now_floor = mn_now;
             }


@@ -906,18 +1100,18 @@ time_update (EV_P)
   else
 #endif
     {
   else
 #endif
     {

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

 
 

-      if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
+      if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))

         {
           periodics_reschedule (EV_A);
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
         {
           periodics_reschedule (EV_A);
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)

-            timers [i]->at += rt_now - mn_now;
+            ((WT)timers [i])->at += ev_rt_now - mn_now;

         }
 
         }
 

-      mn_now = rt_now;
+      mn_now = ev_rt_now;

     }
 }
 
     }
 }
 


@@ -950,12 +1144,16 @@ ev_loop (EV_P_ int flags)
           call_pending (EV_A);
         }
 
           call_pending (EV_A);
         }
 

+      /* we might have forked, so reify kernel state if necessary */
+      if (expect_false (postfork))
+        loop_fork (EV_A);
+

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

-      /* we only need this for !monotonic clockor timers, but as we basically
+      /* we only need this for !monotonic clock or timers, but as we basically

          always have timers, we just calculate it always */
 #if EV_USE_MONOTONIC
       if (expect_true (have_monotonic))
          always have timers, we just calculate it always */
 #if EV_USE_MONOTONIC
       if (expect_true (have_monotonic))


@@ -963,8 +1161,8 @@ ev_loop (EV_P_ int flags)
       else
 #endif
         {
       else
 #endif
         {

-          rt_now = ev_time ();
-          mn_now = rt_now;
+          ev_rt_now = ev_time ();
+          mn_now    = ev_rt_now;

         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)


@@ -975,13 +1173,13 @@ ev_loop (EV_P_ int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

-              ev_tstamp to = timers [0]->at - mn_now + method_fudge;
+              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;

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

-              ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
+              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;

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


@@ -990,7 +1188,7 @@ ev_loop (EV_P_ int flags)
 
       method_poll (EV_A_ block);
 
 
       method_poll (EV_A_ block);
 

-      /* update rt_now, do magic */
+      /* update ev_rt_now, do magic */

       time_update (EV_A);
 
       /* queue pending timers and reschedule them */
       time_update (EV_A);
 
       /* queue pending timers and reschedule them */


@@ -998,7 +1196,7 @@ ev_loop (EV_P_ int flags)
       periodics_reify (EV_A); /* absolute timers called first */
 
       /* queue idle watchers unless io or timers are pending */
       periodics_reify (EV_A); /* absolute timers called first */
 
       /* queue idle watchers unless io or timers are pending */

-      if (!pendingcnt)
+      if (idlecnt && !any_pending (EV_A))

         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */


@@ -1083,7 +1281,7 @@ ev_io_start (EV_P_ struct ev_io *w)
   assert (("ev_io_start called with negative fd", fd >= 0));
 
   ev_start (EV_A_ (W)w, 1);
   assert (("ev_io_start called with negative fd", fd >= 0));
 
   ev_start (EV_A_ (W)w, 1);

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

   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
   fd_change (EV_A_ fd);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
   fd_change (EV_A_ fd);


@@ -1108,14 +1306,16 @@ ev_timer_start (EV_P_ struct ev_timer *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  w->at += mn_now;
+  ((WT)w)->at += mn_now;

 
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);
 
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);

-  array_needsize (timers, timermax, timercnt, );
+  array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));

   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);

+
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));

 }
 
 void
 }
 
 void


@@ -1125,13 +1325,15 @@ ev_timer_stop (EV_P_ struct ev_timer *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

-  if (w->active < timercnt--)
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
+
+  if (((W)w)->active < timercnt--)

     {
     {

-      timers [w->active - 1] = timers [timercnt];
-      downheap ((WT *)timers, timercnt, w->active - 1);
+      timers [((W)w)->active - 1] = timers [timercnt];
+      downheap ((WT *)timers, timercnt, ((W)w)->active - 1);

     }
 
     }
 

-  w->at = w->repeat;
+  ((WT)w)->at = w->repeat;

 
   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }


@@ -1142,10 +1344,7 @@ ev_timer_again (EV_P_ struct ev_timer *w)
   if (ev_is_active (w))
     {
       if (w->repeat)
   if (ev_is_active (w))
     {
       if (w->repeat)

-        {
-          w->at = mn_now + w->repeat;
-          downheap ((WT *)timers, timercnt, w->active - 1);
-        }
+        adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);

       else
         ev_timer_stop (EV_A_ w);
     }
       else
         ev_timer_stop (EV_A_ w);
     }


@@ -1159,16 +1358,21 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
   if (ev_is_active (w))
     return;
 
   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 ((rt_now - w->at) / w->interval) * w->interval;
+  if (w->reschedule_cb)
+    ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
+  else if (w->interval)
+    {
+      assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
+      /* this formula differs from the one in periodic_reify because we do not always round up */
+      ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
+    }

 
   ev_start (EV_A_ (W)w, ++periodiccnt);
 
   ev_start (EV_A_ (W)w, ++periodiccnt);

-  array_needsize (periodics, periodicmax, periodiccnt, );
+  array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));

   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);
   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);

+
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));

 }
 
 void
 }
 
 void


@@ -1178,15 +1382,25 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

-  if (w->active < periodiccnt--)
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
+
+  if (((W)w)->active < periodiccnt--)

     {
     {

-      periodics [w->active - 1] = periodics [periodiccnt];
-      downheap ((WT *)periodics, periodiccnt, w->active - 1);
+      periodics [((W)w)->active - 1] = periodics [periodiccnt];
+      downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);

     }
 
   ev_stop (EV_A_ (W)w);
 }
 
     }
 
   ev_stop (EV_A_ (W)w);
 }
 

+void
+ev_periodic_again (EV_P_ struct ev_periodic *w)
+{
+  /* TODO: use adjustheap and recalculation */
+  ev_periodic_stop (EV_A_ w);
+  ev_periodic_start (EV_A_ w);
+}
+

 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {


@@ -1194,7 +1408,7 @@ ev_idle_start (EV_P_ struct ev_idle *w)
     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);

-  array_needsize (idles, idlemax, idlecnt, );
+  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));

   idles [idlecnt - 1] = w;
 }
 
   idles [idlecnt - 1] = w;
 }
 


@@ -1205,7 +1419,7 @@ ev_idle_stop (EV_P_ struct ev_idle *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  idles [w->active - 1] = idles [--idlecnt];
+  idles [((W)w)->active - 1] = idles [--idlecnt];

   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 


@@ -1216,7 +1430,7 @@ ev_prepare_start (EV_P_ struct ev_prepare *w)
     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);

-  array_needsize (prepares, preparemax, preparecnt, );
+  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));

   prepares [preparecnt - 1] = w;
 }
 
   prepares [preparecnt - 1] = w;
 }
 


@@ -1227,7 +1441,7 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  prepares [w->active - 1] = prepares [--preparecnt];
+  prepares [((W)w)->active - 1] = prepares [--preparecnt];

   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 


@@ -1238,7 +1452,7 @@ ev_check_start (EV_P_ struct ev_check *w)
     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);
     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);

-  array_needsize (checks, checkmax, checkcnt, );
+  array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));

   checks [checkcnt - 1] = w;
 }
 
   checks [checkcnt - 1] = w;
 }
 


@@ -1249,7 +1463,7 @@ ev_check_stop (EV_P_ struct ev_check *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  checks [w->active - 1] = checks [--checkcnt];
+  checks [((W)w)->active - 1] = checks [--checkcnt];

   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }
 


@@ -1269,16 +1483,20 @@ ev_signal_start (EV_P_ struct ev_signal *w)
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 
   ev_start (EV_A_ (W)w, 1);
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 
   ev_start (EV_A_ (W)w, 1);

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

   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
 
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
 

-  if (!w->next)
+  if (!((WL)w)->next)

     {
     {

+#if WIN32
+      signal (w->signum, sighandler);
+#else

       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);

+#endif

     }
 }
 
     }
 }
 


@@ -1338,7 +1556,7 @@ once_cb (EV_P_ struct ev_once *once, int revents)
 
   ev_io_stop (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);
 
   ev_io_stop (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);

-  free (once);
+  ev_free (once);

 
   cb (revents, arg);
 }
 
   cb (revents, arg);
 }


@@ -1358,7 +1576,7 @@ once_cb_to (EV_P_ struct ev_timer *w, int revents)
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {
 void
 ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
 {

-  struct ev_once *once = malloc (sizeof (struct ev_once));
+  struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));

 
   if (!once)
     cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
 
   if (!once)
     cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);


@@ -1367,14 +1585,14 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
       once->cb  = cb;
       once->arg = arg;
 
       once->cb  = cb;
       once->arg = arg;
 

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

       if (fd >= 0)
         {
           ev_io_set (&once->io, fd, events);
           ev_io_start (EV_A_ &once->io);
         }
 
       if (fd >= 0)
         {
           ev_io_set (&once->io, fd, events);
           ev_io_start (EV_A_ &once->io);
         }
 

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

       if (timeout >= 0.)
         {
           ev_timer_set (&once->to, timeout, 0.);
       if (timeout >= 0.)
         {
           ev_timer_set (&once->to, timeout, 0.);


@@ -1383,3 +1601,7 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
     }
 }
 
     }
 }
 

+#ifdef __cplusplus
+}
+#endif
+