*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 9686364d52d5945306a2855720d6894241c0672e..e3e7e579a1cdf65987901f84229791b8ee00b108 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -30,13 +30,33 @@
  */
 #ifndef EV_STANDALONE
 # include "config.h"
  */
 #ifndef EV_STANDALONE
 # include "config.h"

+
+# if HAVE_CLOCK_GETTIME
+#  define EV_USE_MONOTONIC 1
+#  define EV_USE_REALTIME  1
+# endif
+
+# if HAVE_SELECT && HAVE_SYS_SELECT_H
+#  define EV_USE_SELECT 1
+# endif
+
+# if HAVE_POLL && HAVE_POLL_H
+#  define EV_USE_POLL 1
+# endif
+
+# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
+#  define EV_USE_EPOLL 1
+# endif
+
+# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+#  define EV_USE_KQUEUE 1
+# endif
+

 #endif
 
 #include <math.h>
 #include <stdlib.h>
 #endif
 
 #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>


@@ -44,12 +64,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


@@ -60,8 +83,8 @@
 # define EV_USE_SELECT 1
 #endif
 
 # define EV_USE_SELECT 1
 #endif
 

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

 #endif
 
 #ifndef EV_USE_EPOLL
 #endif
 
 #ifndef EV_USE_EPOLL


@@ -72,6 +95,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,11 +150,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;


@@ -187,23 +270,39 @@ ev_now (EV_P)
   return rt_now;
 }
 
   return rt_now;
 }
 

-#define array_roundsize(base,n) ((n) | 4 & ~3)
-
-#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_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_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


@@ -229,7 +328,7 @@ event (EV_P_ W w, int events)
     }
 
   w->pending = ++pendingcnt [ABSPRI (w)];
     }
 
   w->pending = ++pendingcnt [ABSPRI (w)];

-  array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], 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 = events;
 }
   pendings [ABSPRI (w)][w->pending - 1].w      = w;
   pendings [ABSPRI (w)][w->pending - 1].events = events;
 }


@@ -278,11 +377,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;


@@ -291,13 +387,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;
 }
 


@@ -313,6 +409,16 @@ fd_kill (EV_P_ int fd)
     }
 }
 
     }
 }
 

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


@@ -321,7 +427,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);
 }
 


@@ -329,18 +435,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)
 {


@@ -351,7 +456,7 @@ fd_rearm_all (EV_P)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;

-        fd_change (fd);
+        fd_change (EV_A_ fd);

       }
 }
 
       }
 }
 


@@ -365,12 +470,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;

 
 }
 
 
 }
 


@@ -390,19 +495,19 @@ 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;

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

-  struct ev_watcher_list *head;
+  WL head;

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


@@ -411,6 +516,7 @@ static int signalmax;
 
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;
 
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;

+static struct ev_io sigev;

 
 static void
 signals_init (ANSIG *base, int count)
 
 static void
 signals_init (ANSIG *base, int count)


@@ -427,6 +533,10 @@ 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)
   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)


@@ -441,7 +551,7 @@ sighandler (int signum)
 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;
+  WL w;

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


@@ -476,8 +586,12 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

+static struct ev_child *childs [PID_HASHSIZE];
+

 #ifndef WIN32
 
 #ifndef WIN32
 

+static struct ev_signal childev;
+

 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif
 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif


@@ -490,9 +604,9 @@ 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;
+        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
+        w->rpid         = pid;
+        w->rstatus      = status;

         event (EV_A_ (W)w, EV_CHILD);
       }
 }
         event (EV_A_ (W)w, EV_CHILD);
       }
 }


@@ -522,7 +636,7 @@ childcb (EV_P_ struct ev_signal *sw, int revents)
 #if EV_USE_EPOLL
 # include "ev_epoll.c"
 #endif
 #if EV_USE_EPOLL
 # include "ev_epoll.c"
 #endif

-#if EV_USEV_POLL
+#if EV_USE_POLL

 # include "ev_poll.c"
 #endif
 #if EV_USE_SELECT
 # include "ev_poll.c"
 #endif
 #if EV_USE_SELECT


@@ -584,62 +698,101 @@ 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_EPOLL
       if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init  (EV_A_ methods);
 #endif
 #if EV_USE_KQUEUE
       if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
 #endif
 #if EV_USE_EPOLL
       if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init  (EV_A_ methods);
 #endif

-#if EV_USEV_POLL
+#if EV_USE_POLL

       if (!method && (methods & EVMETHOD_POLL  )) method = poll_init   (EV_A_ methods);
 #endif
 #if EV_USE_SELECT
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif
       if (!method && (methods & EVMETHOD_POLL  )) method = poll_init   (EV_A_ methods);
 #endif
 #if EV_USE_SELECT
       if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
 #endif

+
+      ev_watcher_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_EPOLL
   if (method == EVMETHOD_EPOLL ) epoll_destroy  (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif
 #if EV_USE_EPOLL
   if (method == EVMETHOD_EPOLL ) epoll_destroy  (EV_A);
 #endif

-#if EV_USEV_POLL
+#if EV_USE_POLL

   if (method == EVMETHOD_POLL  ) poll_destroy   (EV_A);
 #endif
 #if EV_USE_SELECT
   if (method == EVMETHOD_SELECT) select_destroy (EV_A);
 #endif
 
   if (method == EVMETHOD_POLL  ) poll_destroy   (EV_A);
 #endif
 #if EV_USE_SELECT
   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);
 

-  if (ev_methods (EV_A))
+  if (ev_method (EV_A))

     return loop;
 
   return 0;
     return loop;
 
   return 0;


@@ -649,13 +802,13 @@ 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
 }
 
 #endif


@@ -688,8 +841,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


@@ -709,10 +860,14 @@ ev_default_loop (int methods)
 void
 ev_default_destroy (void)
 {
 void
 ev_default_destroy (void)
 {

+#if EV_MULTIPLICITY

   struct ev_loop *loop = default_loop;
   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);


@@ -724,17 +879,14 @@ ev_default_destroy (void)
 }
 
 void
 }
 
 void

-ev_default_fork (EV_P)
+ev_default_fork (void)

 {
 {

-  loop_fork (EV_A);
-
-  ev_io_stop (EV_A_ &sigev);
-  close (sigpipe [0]);
-  close (sigpipe [1]);
-  pipe (sigpipe);
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#endif

 
 

-  ev_ref (EV_A); /* signal watcher */
-  siginit (EV_A);
+  if (method)
+    postfork = 1;

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


@@ -760,15 +912,17 @@ 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
           downheap ((WT *)timers, timercnt, 0);
         }
       else


@@ -781,15 +935,17 @@ timers_reify (EV_P)
 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 <= 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 */
       if (w->interval)
         {
       /* first reschedule or stop timer */
       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 ((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 > rt_now));

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


@@ -811,7 +967,7 @@ periodics_reschedule (EV_P)
 
       if (w->interval)
         {
 
       if (w->interval)
         {

-          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
+          ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;

 
           if (fabs (diff) >= 1e-4)
             {
 
           if (fabs (diff) >= 1e-4)
             {


@@ -882,7 +1038,7 @@ time_update (EV_P)
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
 
           /* 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 += rt_now - mn_now;

         }
 
       mn_now = rt_now;
         }
 
       mn_now = rt_now;


@@ -918,6 +1074,10 @@ 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);
 
       /* update fd-related kernel structures */
       fd_reify (EV_A);
 


@@ -943,13 +1103,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 - rt_now + method_fudge;

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


@@ -1051,7 +1211,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);


@@ -1076,14 +1236,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


@@ -1093,13 +1255,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);
 }


@@ -1111,8 +1275,8 @@ ev_timer_again (EV_P_ struct ev_timer *w)
     {
       if (w->repeat)
         {
     {
       if (w->repeat)
         {

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

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


@@ -1131,12 +1295,14 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)
 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)

-    w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
+    ((WT)w)->at += ceil ((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


@@ -1146,10 +1312,12 @@ 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);


@@ -1162,7 +1330,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;
 }
 


@@ -1173,7 +1341,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);
 }
 


@@ -1184,7 +1352,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;
 }
 


@@ -1195,7 +1363,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);
 }
 


@@ -1206,7 +1374,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;
 }
 


@@ -1217,7 +1385,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);
 }
 


@@ -1237,16 +1405,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

     }
 }
 
     }
 }
 


@@ -1306,7 +1478,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);
 }


@@ -1326,7 +1498,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);