[ViewVC] Diff of: cvs/libev/ev.c

Comparing libev/ev.c (file contents):
Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC

  * 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.
  */
+#ifdef __cplusplus
+extern "C" {
+#endif
 #ifndef EV_STANDALONE
 # include "config.h"
+# if HAVE_CLOCK_GETTIME
+#  ifndef EV_USE_MONOTONIC
+#   define EV_USE_MONOTONIC 1
+#  endif
+#  ifndef EV_USE_REALTIME
+#   define EV_USE_REALTIME  1
+#  endif
+# endif
+# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
+#  define EV_USE_SELECT 1
+# endif
+# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
+#  define EV_USE_POLL 1
+# endif
+# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
+#  define EV_USE_EPOLL 1
+# endif
+# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
+#  define EV_USE_KQUEUE 1
+# endif
 #endif
 #include <math.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
+#include <time.h>
+#include <signal.h>
 #ifndef WIN32
+# include <unistd.h>
+# include <sys/time.h>
 # include <sys/wait.h>
 #endif
-#include <sys/time.h>
-#include <time.h>
 /**/
 #ifndef EV_USE_MONOTONIC
 # define EV_USE_MONOTONIC 1
 #endif
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
-#ifndef EV_USEV_POLL
+#ifndef EV_USE_POLL
-# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
+# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
 #endif
 #ifndef EV_USE_EPOLL
 # define EV_USE_EPOLL 0
 #endif
 #ifndef EV_USE_KQUEUE
 # 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
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
 #define PID_HASHSIZE  16 /* size of pid hash table, must be power of two */
 /*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
+#ifdef EV_H
+# include EV_H
+#else
-#include "ev.h"
+# include "ev.h"
+#endif
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define inline                     inline
 #else
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;
+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
 {
-  struct ev_watcher_list *head;
+  WL head;
   unsigned char events;
   unsigned char reify;
 } ANFD;
 typedef struct
 {
   W w;
   int events;
 } ANPENDING;
-#ifdef EV_MULTIPLICITY
+#if EV_MULTIPLICITY
-struct ev_loop
+  struct ev_loop
-{
+  {
+    ev_tstamp ev_rt_now;
-# define VAR(name,decl) decl
+    #define VAR(name,decl) decl;
-# include "ev_vars.h"
+      #include "ev_vars.h"
-};
+    #undef VAR
+  };
+  #include "ev_wrap.h"
+  struct ev_loop default_loop_struct;
+  static struct ev_loop *default_loop;
 #else
+  ev_tstamp ev_rt_now;
-# define VAR(name,decl) static decl
+  #define VAR(name,decl) static decl;
-# include "ev_vars.h"
+    #include "ev_vars.h"
-#endif
-#undef VAR
+  #undef VAR
+  static int default_loop;
+#endif
 /*****************************************************************************/
-inline ev_tstamp
+ev_tstamp
 ev_time (void)
 {
 #if EV_USE_REALTIME
   struct timespec ts;
   clock_gettime (CLOCK_REALTIME, &ts);
 #endif
   return ev_time ();
 }
+#if EV_MULTIPLICITY
 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(base,cur,cnt,init)		\
+#define array_needsize(type,base,cur,cnt,init)			\
-  if (expect_false ((cnt) > cur))			\
+  if (expect_false ((cnt) > cur))				\
-    {							\
+    {								\
-      int newcnt = cur;					\
+      int newcnt = cur;						\
-      do						\
+      do							\
-        {						\
+        {							\
-          newcnt = array_roundsize (base, newcnt << 1);	\
+          newcnt = array_roundsize (type, newcnt << 1);		\
-        }						\
+        }							\
-      while ((cnt) > newcnt);				\
+      while ((cnt) > newcnt);					\
-      							\
+      								\
-      base = realloc (base, sizeof (*base) * (newcnt));	\
+      base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
-      init (base + cur, newcnt - cur);			\
+      init (base + cur, newcnt - cur);				\
-      cur = newcnt;					\
+      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
 anfds_init (ANFD *base, int count)
       ++base;
     }
 }
-static void
+void
-event (EV_P_ W w, int events)
+ev_feed_event (EV_P_ void *w, int revents)
 {
+  W w_ = (W)w;
-  if (w->pending)
+  if (w_->pending)
     {
-      pendings [ABSPRI (w)][w->pending - 1].events |= events;
+      pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;
     }
-  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].w      = w_;
-  pendings [ABSPRI (w)][w->pending - 1].events = events;
+  pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
 }
 static void
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
   for (i = 0; i < eventcnt; ++i)
-    event (EV_A_ events [i], type);
+    ev_feed_event (EV_A_ events [i], type);
 }
-static void
+inline void
-fd_event (EV_P_ int fd, int events)
+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)
     {
-      int ev = w->events & events;
+      int ev = w->events & revents;
       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
       for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
         events |= w->events;
       anfd->reify = 0;
-      if (anfd->events != events)
-        {
-          method_modify (EV_A_ fd, anfd->events, events);
+      method_modify (EV_A_ fd, anfd->events, events);
-          anfd->events = events;
+      anfd->events = events;
-        }
     }
   fdchangecnt = 0;
 }
 static void
 fd_change (EV_P_ int fd)
 {
-  if (anfds [fd].reify || fdchangecnt < 0)
+  if (anfds [fd].reify)
     return;
   anfds [fd].reify = 1;
   ++fdchangecnt;
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
   fdchanges [fdchangecnt - 1] = fd;
 }
 static void
 fd_kill (EV_P_ int fd)
   struct ev_io *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)
 {
   int fd;
   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);
 }
 /* called on ENOMEM in select/poll to kill some fds and retry */
 static void
 fd_enomem (EV_P)
 {
-  int fd = anfdmax;
+  int fd;
-  while (fd--)
+  for (fd = anfdmax; fd--; )
     if (anfds [fd].events)
       {
-        close (fd);
         fd_kill (EV_A_ fd);
         return;
       }
 }
+/* usually called after fork if method needs to re-arm all fds from scratch */
+static void
+fd_rearm_all (EV_P)
+{
+  int fd;
+  /* this should be highly optimised to not do anything but set a flag */
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].events)
+      {
+        anfds [fd].events = 0;
+        fd_change (EV_A_ fd);
+      }
+}
 /*****************************************************************************/
 static void
-upheap (WT *timers, int k)
+upheap (WT *heap, int k)
 {
-  WT w = timers [k];
+  WT w = heap [k];
-  while (k && timers [k >> 1]->at > w->at)
+  while (k && heap [k >> 1]->at > w->at)
     {
-      timers [k] = timers [k >> 1];
+      heap [k] = heap [k >> 1];
-      timers [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;
       k >>= 1;
     }
-  timers [k] = w;
+  heap [k] = w;
-  timers [k]->active = k + 1;
+  ((W)heap [k])->active = k + 1;
 }
 static void
-downheap (WT *timers, int N, int k)
+downheap (WT *heap, int N, int k)
 {
-  WT w = timers [k];
+  WT w = heap [k];
   while (k < (N >> 1))
     {
       int j = k << 1;
-      if (j + 1 < N && timers [j]->at > timers [j + 1]->at)
+      if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
         ++j;
-      if (w->at <= timers [j]->at)
+      if (w->at <= heap [j]->at)
         break;
-      timers [k] = timers [j];
+      heap [k] = heap [j];
-      timers [k]->active = k + 1;
+      ((W)heap [k])->active = k + 1;
       k = j;
     }
-  timers [k] = w;
+  heap [k] = w;
-  timers [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
 {
-  struct ev_watcher_list *head;
+  WL head;
   sig_atomic_t volatile gotsig;
 } ANSIG;
 static ANSIG *signals;
 static int signalmax;
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;
+static struct ev_io sigev;
 static void
 signals_init (ANSIG *base, int count)
 {
   while (count--)
 }
 static void
 sighandler (int signum)
 {
+#if WIN32
+  signal (signum, sighandler);
+#endif
   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);
+#endif
       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)
 {
-  struct ev_watcher_list *w;
   int signum;
+#ifdef WIN32
+  recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
+#else
   read (sigpipe [0], &revents, 1);
+#endif
   gotsig = 0;
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
-      {
+      ev_feed_signal_event (EV_A_ signum + 1);
-        signals [signum].gotsig = 0;
-        for (w = signals [signum].head; w; w = w->next)
-          event (EV_A_ (W)w, EV_SIGNAL);
-      }
 }
 static void
 siginit (EV_P)
 {
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
 #endif
   ev_io_set (&sigev, sigpipe [0], EV_READ);
-  ev_io_start (&sigev);
+  ev_io_start (EV_A_ &sigev);
   ev_unref (EV_A); /* child watcher should not keep loop alive */
 }
 /*****************************************************************************/
+static struct ev_child *childs [PID_HASHSIZE];
 #ifndef WIN32
+static struct ev_signal childev;
 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif
   struct ev_child *w;
   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* */
+        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
-        w->rpid     = pid;
+        w->rpid         = pid;
-        w->rstatus  = status;
+        w->rstatus      = status;
-        event (EV_A_ (W)w, EV_CHILD);
+        ev_feed_event (EV_A_ (W)w, EV_CHILD);
       }
 }
 static void
 childcb (EV_P_ struct ev_signal *sw, int revents)
   int pid, status;
   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 */
     }
 }
 # include "ev_kqueue.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_select.c"
 #endif
 ev_method (EV_P)
 {
   return method;
 }
-int
+static void
-ev_init (EV_P_ int methods)
+loop_init (EV_P_ int methods)
 {
-#ifdef EV_MULTIPLICITY
-  memset (loop, 0, sizeof (struct ev_loop));
-#endif
   if (!method)
     {
 #if EV_USE_MONOTONIC
       {
         struct timespec ts;
         if (!clock_gettime (CLOCK_MONOTONIC, &ts))
           have_monotonic = 1;
       }
 #endif
-      rt_now    = ev_time ();
+      ev_rt_now = ev_time ();
       mn_now    = get_clock ();
       now_floor = mn_now;
-      diff      = rt_now - mn_now;
+      rtmn_diff = ev_rt_now - mn_now;
-      if (pipe (sigpipe))
-        return 0;
       if (methods == EVMETHOD_AUTO)
-        if (!enable_secure () && getenv ("LIBmethodS"))
+        if (!enable_secure () && getenv ("LIBEV_METHODS"))
-          methods = atoi (getenv ("LIBmethodS"));
+          methods = atoi (getenv ("LIBEV_METHODS"));
         else
           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_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
+      ev_init (&sigev, sigcb);
+      ev_set_priority (&sigev, EV_MAXPRI);
+    }
+}
+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_POLL
+  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);
+#if EV_PERIODICS
+  array_free_microshit (periodic);
+#endif
+  array_free_microshit (idle);
+  array_free_microshit (prepare);
+  array_free_microshit (check);
+  method = 0;
+}
+static void
+loop_fork (EV_P)
+{
+#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)
+{
+  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);
+  if (ev_method (EV_A))
+    return loop;
+  return 0;
+}
+void
+ev_loop_destroy (EV_P)
+{
+  loop_destroy (EV_A);
+  ev_free (loop);
+}
+void
+ev_loop_fork (EV_P)
+{
+  postfork = 1;
+}
+#endif
+#if EV_MULTIPLICITY
+struct ev_loop *
+#else
+int
+#endif
+ev_default_loop (int methods)
+{
+  if (sigpipe [0] == sigpipe [1])
+    if (pipe (sigpipe))
+      return 0;
+  if (!default_loop)
+    {
+#if EV_MULTIPLICITY
+      struct ev_loop *loop = default_loop = &default_loop_struct;
+#else
+      default_loop = 1;
+#endif
+      loop_init (EV_A_ methods);
-      if (method)
+      if (ev_method (EV_A))
         {
-          ev_watcher_init (&sigev, sigcb);
-          ev_set_priority (&sigev, EV_MAXPRI);
           siginit (EV_A);
 #ifndef WIN32
           ev_signal_init (&childev, childcb, SIGCHLD);
           ev_set_priority (&childev, EV_MAXPRI);
           ev_signal_start (EV_A_ &childev);
           ev_unref (EV_A); /* child watcher should not keep loop alive */
 #endif
         }
+      else
+        default_loop = 0;
     }
-  return method;
+  return default_loop;
+}
+void
+ev_default_destroy (void)
+{
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#endif
+#ifndef WIN32
+  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);
+  close (sigpipe [0]); sigpipe [0] = 0;
+  close (sigpipe [1]); sigpipe [1] = 0;
+  loop_destroy (EV_A);
+}
+void
+ev_default_fork (void)
+{
+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#endif
+  if (method)
+    postfork = 1;
 }
 /*****************************************************************************/
-void
+static int
-ev_fork_prepare (void)
+any_pending (EV_P)
 {
-  /* nop */
+  int pri;
-}
-void
+  for (pri = NUMPRI; pri--; )
-ev_fork_parent (void)
+    if (pendingcnt [pri])
-{
+      return 1;
-  /* nop */
-}
-void
+  return 0;
-ev_fork_child (void)
-{
-#if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL)
-    epoll_postfork_child ();
-#endif
-  ev_io_stop (&sigev);
-  close (sigpipe [0]);
-  close (sigpipe [1]);
-  pipe (sigpipe);
-  siginit ();
 }
-/*****************************************************************************/
 static void
 call_pending (EV_P)
 {
   int pri;
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
         if (p->w)
           {
             p->w->pending = 0;
-            p->w->cb (EV_A_ p->w, p->events);
+            EV_CB_INVOKE (p->w, p->events);
           }
       }
 }
 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];
+      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.));
-          w->at = mn_now + w->repeat;
+          ((WT)w)->at += w->repeat;
+          if (((WT)w)->at < mn_now)
+            ((WT)w)->at = mn_now;
           downheap ((WT *)timers, timercnt, 0);
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
-      event ((W)w, EV_TIMEOUT);
+      ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
     }
 }
+#if EV_PERIODICS
 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];
+      assert (("inactive timer on periodic heap detected", ev_is_active (w)));
       /* 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;
+          ((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?", w->at > rt_now));
+          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 */
-      event (EV_A_ (W)w, EV_PERIODIC);
+      ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
     }
 }
 static void
-periodics_reschedule (EV_P_ ev_tstamp diff)
+periodics_reschedule (EV_P)
 {
   int i;
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {
       struct ev_periodic *w = periodics [i];
+      if (w->reschedule_cb)
+        ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
-      if (w->interval)
+      else if (w->interval)
-        {
-          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
+        ((WT)w)->at += ceil ((ev_rt_now - ((WT)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 */
-            }
-        }
     }
+  /* now rebuild the heap */
+  for (i = periodiccnt >> 1; i--; )
+    downheap ((WT *)periodics, periodiccnt, i);
 }
+#endif
 inline int
 time_update_monotonic (EV_P)
 {
   mn_now = get_clock ();
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {
-      rt_now = mn_now + diff;
+      ev_rt_now = rtmn_diff + mn_now;
       return 0;
     }
   else
     {
       now_floor = mn_now;
-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();
       return 1;
     }
 }
 static void
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
       if (time_update_monotonic (EV_A))
         {
-          ev_tstamp odiff = diff;
+          ev_tstamp odiff = rtmn_diff;
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {
-              diff = rt_now - mn_now;
+              rtmn_diff = ev_rt_now - mn_now;
-              if (fabs (odiff - diff) < MIN_TIMEJUMP)
+              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;
             }
+# if EV_PERIODICS
-          periodics_reschedule (EV_A_ diff - odiff);
+          periodics_reschedule (EV_A);
+# endif
           /* no timer adjustment, as the monotonic clock doesn't jump */
+          /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
         }
     }
   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))
         {
+#if EV_PERIODICS
-          periodics_reschedule (EV_A_ rt_now - mn_now);
+          periodics_reschedule (EV_A);
+#endif
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
-            timers [i]->at += diff;
+            ((WT)timers [i])->at += ev_rt_now - mn_now;
         }
-      mn_now = rt_now;
+      mn_now = ev_rt_now;
     }
 }
 void
 ev_ref (EV_P)
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           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 */
-      /* 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))
         time_update_monotonic (EV_A);
       else
 #endif
         {
-          rt_now = ev_time ();
+          ev_rt_now = ev_time ();
-          mn_now = rt_now;
+          mn_now    = ev_rt_now;
         }
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;
       else
         {
           block = MAX_BLOCKTIME;
           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 EV_PERIODICS
           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;
             }
+#endif
           if (block < 0.) block = 0.;
         }
       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 */
       timers_reify (EV_A); /* relative timers called last */
+#if EV_PERIODICS
       periodics_reify (EV_A); /* absolute timers called first */
+#endif
       /* 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 */
       if (checkcnt)
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
     return;
   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);
 }
 {
   ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
+  assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
   fd_change (EV_A_ w->fd);
 }
 ev_timer_start (EV_P_ struct ev_timer *w)
 {
   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);
-  array_needsize (timers, timermax, timercnt, );
+  array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
 }
 void
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
-  if (w->active < timercnt--)
+  if (((W)w)->active < timercnt--)
     {
-      timers [w->active - 1] = timers [timercnt];
+      timers [((W)w)->active - 1] = timers [timercnt];
-      downheap ((WT *)timers, timercnt, w->active - 1);
+      downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
     }
-  w->at = w->repeat;
+  ((WT)w)->at -= mn_now;
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_timer_again (EV_P_ struct ev_timer *w)
 {
   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 if (w->repeat)
     ev_timer_start (EV_A_ w);
 }
+#if EV_PERIODICS
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {
   if (ev_is_active (w))
     return;
+  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.));
+      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 */
+      /* 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 ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
+    }
   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);
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
 }
 void
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
-  if (w->active < periodiccnt--)
+  if (((W)w)->active < periodiccnt--)
     {
-      periodics [w->active - 1] = periodics [periodiccnt];
+      periodics [((W)w)->active - 1] = periodics [periodiccnt];
-      downheap ((WT *)periodics, periodiccnt, w->active - 1);
+      downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
     }
+  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);
+}
+#endif
+void
+ev_idle_start (EV_P_ struct ev_idle *w)
+{
+  if (ev_is_active (w))
+    return;
+  ev_start (EV_A_ (W)w, ++idlecnt);
+  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
+  idles [idlecnt - 1] = w;
+}
+void
+ev_idle_stop (EV_P_ struct ev_idle *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (ev_is_active (w))
+    return;
+  idles [((W)w)->active - 1] = idles [--idlecnt];
+  ev_stop (EV_A_ (W)w);
+}
+void
+ev_prepare_start (EV_P_ struct ev_prepare *w)
+{
+  if (ev_is_active (w))
+    return;
+  ev_start (EV_A_ (W)w, ++preparecnt);
+  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
+  prepares [preparecnt - 1] = w;
+}
+void
+ev_prepare_stop (EV_P_ struct ev_prepare *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (ev_is_active (w))
+    return;
+  prepares [((W)w)->active - 1] = prepares [--preparecnt];
+  ev_stop (EV_A_ (W)w);
+}
+void
+ev_check_start (EV_P_ struct ev_check *w)
+{
+  if (ev_is_active (w))
+    return;
+  ev_start (EV_A_ (W)w, ++checkcnt);
+  array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
+  checks [checkcnt - 1] = w;
+}
+void
+ev_check_stop (EV_P_ struct ev_check *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (!ev_is_active (w))
+    return;
+  checks [((W)w)->active - 1] = checks [--checkcnt];
   ev_stop (EV_A_ (W)w);
 }
 #ifndef SA_RESTART
 # define SA_RESTART 0
 #endif
 void
 ev_signal_start (EV_P_ struct ev_signal *w)
 {
+#if EV_MULTIPLICITY
+  assert (("signal watchers are only supported in the default loop", loop == default_loop));
+#endif
   if (ev_is_active (w))
     return;
   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);
-  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);
+#endif
     }
 }
 void
 ev_signal_stop (EV_P_ struct ev_signal *w)
   if (!signals [w->signum - 1].head)
     signal (w->signum, SIG_DFL);
 }
 void
-ev_idle_start (EV_P_ struct ev_idle *w)
-{
-  if (ev_is_active (w))
-    return;
-  ev_start (EV_A_ (W)w, ++idlecnt);
-  array_needsize (idles, idlemax, idlecnt, );
-  idles [idlecnt - 1] = w;
-}
-void
-ev_idle_stop (EV_P_ struct ev_idle *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (ev_is_active (w))
-    return;
-  idles [w->active - 1] = idles [--idlecnt];
-  ev_stop (EV_A_ (W)w);
-}
-void
-ev_prepare_start (EV_P_ struct ev_prepare *w)
-{
-  if (ev_is_active (w))
-    return;
-  ev_start (EV_A_ (W)w, ++preparecnt);
-  array_needsize (prepares, preparemax, preparecnt, );
-  prepares [preparecnt - 1] = w;
-}
-void
-ev_prepare_stop (EV_P_ struct ev_prepare *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (ev_is_active (w))
-    return;
-  prepares [w->active - 1] = prepares [--preparecnt];
-  ev_stop (EV_A_ (W)w);
-}
-void
-ev_check_start (EV_P_ struct ev_check *w)
-{
-  if (ev_is_active (w))
-    return;
-  ev_start (EV_A_ (W)w, ++checkcnt);
-  array_needsize (checks, checkmax, checkcnt, );
-  checks [checkcnt - 1] = w;
-}
-void
-ev_check_stop (EV_P_ struct ev_check *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (ev_is_active (w))
-    return;
-  checks [w->active - 1] = checks [--checkcnt];
-  ev_stop (EV_A_ (W)w);
-}
-void
 ev_child_start (EV_P_ struct ev_child *w)
 {
+#if EV_MULTIPLICITY
+  assert (("child watchers are only supported in the default loop", loop == default_loop));
+#endif
   if (ev_is_active (w))
     return;
   ev_start (EV_A_ (W)w, 1);
   wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
 void
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);
-  if (ev_is_active (w))
+  if (!ev_is_active (w))
     return;
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
 }
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
   ev_io_stop (EV_A_ &once->io);
   ev_timer_stop (EV_A_ &once->to);
-  free (once);
+  ev_free (once);
   cb (revents, arg);
 }
 static void
 }
 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);
   else
     {
       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);
         }
-      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.);
           ev_timer_start (EV_A_ &once->to);
         }
     }
 }
-/*****************************************************************************/
+#ifdef __cplusplus
-#if 0
-struct ev_io wio;
-static void
-sin_cb (struct ev_io *w, int revents)
-{
-  fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
 }
-static void
-ocb (struct ev_timer *w, int revents)
-{
-  //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
-  ev_timer_stop (w);
-  ev_timer_start (w);
-}
-static void
-scb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "signal %x,%d\n", revents, w->signum);
-  ev_io_stop (&wio);
-  ev_io_start (&wio);
-}
-static void
-gcb (struct ev_signal *w, int revents)
-{
-  fprintf (stderr, "generic %x\n", revents);
-}
-int main (void)
-{
-  ev_init (0);
-  ev_io_init (&wio, sin_cb, 0, EV_READ);
-  ev_io_start (&wio);
-  struct ev_timer t[10000];
-#if 0
-  int i;
-  for (i = 0; i < 10000; ++i)
-    {
-      struct ev_timer *w = t + i;
-      ev_watcher_init (w, ocb, i);
-      ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
-      ev_timer_start (w);
-      if (drand48 () < 0.5)
-        ev_timer_stop (w);
-    }
 #endif
-  struct ev_timer t1;
-  ev_timer_init (&t1, ocb, 5, 10);
-  ev_timer_start (&t1);
-  struct ev_signal sig;
-  ev_signal_init (&sig, scb, SIGQUIT);
-  ev_signal_start (&sig);
-  struct ev_check cw;
-  ev_check_init (&cw, gcb);
-  ev_check_start (&cw);
-  struct ev_idle iw;
-  ev_idle_init (&iw, gcb);
-  ev_idle_start (&iw);
-  ev_loop (0);
-  return 0;
-}
-#endif

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libev/ev.c (file contents): Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC vs. Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.53 by root, Sat Nov 3 22:31:11 2007 UTC vs.
Revision 1.97 by root, Sun Nov 11 01:53:07 2007 UTC