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

Comparing libev/ev.c (file contents):
Revision 1.22 by root, Wed Oct 31 19:07:43 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

 /*
+ * libev event processing core, watcher management
+ *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * 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.
  */
+#ifndef EV_STANDALONE
+# include "config.h"
+#endif
 #include <math.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
+#ifndef WIN32
-#include <sys/wait.h>
+# include <sys/wait.h>
+#endif
 #include <sys/time.h>
 #include <time.h>
+/**/
-#ifndef HAVE_MONOTONIC
+#ifndef EV_USE_MONOTONIC
+# define EV_USE_MONOTONIC 1
+#endif
+#ifndef EV_USE_SELECT
+# 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 */
+#endif
+#ifndef EV_USE_EPOLL
+# define EV_USE_EPOLL 0
+#endif
+#ifndef EV_USE_KQUEUE
+# define EV_USE_KQUEUE 0
+#endif
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 1
+#endif
+/**/
-# ifdef CLOCK_MONOTONIC
+#ifndef CLOCK_MONOTONIC
+# undef EV_USE_MONOTONIC
-#  define HAVE_MONOTONIC 1
+# define EV_USE_MONOTONIC 0
-# endif
+#endif
-#endif
-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
-#endif
-#ifndef HAVE_EPOLL
-# define HAVE_EPOLL 0
-#endif
-#ifndef HAVE_REALTIME
+#ifndef CLOCK_REALTIME
-# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
+# undef EV_USE_REALTIME
+# define EV_USE_REALTIME 0
 #endif
+/**/
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
-#define MAX_BLOCKTIME 60.
+#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
-#define PID_HASHSIZE  16 /* size of pid hahs table, must be power of two */
+#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"
+#if __GNUC__ >= 3
+# define expect(expr,value)         __builtin_expect ((expr),(value))
+# define inline                     inline
+#else
+# define expect(expr,value)         (expr)
+# define inline                     static
+#endif
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)
+#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define ABSPRI(w) ((w)->priority - EV_MINPRI)
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;
-static ev_tstamp now, diff; /* monotonic clock */
+static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
-ev_tstamp ev_now;
-int ev_method;
-static int have_monotonic; /* runtime */
-static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
-static void (*method_modify)(int fd, int oev, int nev);
-static void (*method_poll)(ev_tstamp timeout);
 /*****************************************************************************/
-ev_tstamp
+typedef struct
+{
+  struct ev_watcher_list *head;
+  unsigned char events;
+  unsigned char reify;
+} ANFD;
+typedef struct
+{
+  W w;
+  int events;
+} ANPENDING;
+#ifdef EV_MULTIPLICITY
+struct ev_loop
+{
+# define VAR(name,decl) decl;
+# include "ev_vars.h"
+};
+# undef VAR
+# include "ev_wrap.h"
+#else
+# define VAR(name,decl) static decl;
+# include "ev_vars.h"
+# undef VAR
+#endif
+/*****************************************************************************/
+inline ev_tstamp
 ev_time (void)
 {
-#if HAVE_REALTIME
+#if EV_USE_REALTIME
   struct timespec ts;
   clock_gettime (CLOCK_REALTIME, &ts);
   return ts.tv_sec + ts.tv_nsec * 1e-9;
 #else
   struct timeval tv;
   gettimeofday (&tv, 0);
   return tv.tv_sec + tv.tv_usec * 1e-6;
 #endif
 }
-static ev_tstamp
+inline ev_tstamp
 get_clock (void)
 {
-#if HAVE_MONOTONIC
+#if EV_USE_MONOTONIC
-  if (have_monotonic)
+  if (expect_true (have_monotonic))
     {
       struct timespec ts;
       clock_gettime (CLOCK_MONOTONIC, &ts);
       return ts.tv_sec + ts.tv_nsec * 1e-9;
     }
 #endif
   return ev_time ();
 }
+ev_tstamp
+ev_now (EV_P)
+{
+  return rt_now;
+}
+#define array_roundsize(base,n) ((n) | 4 & ~3)
 #define array_needsize(base,cur,cnt,init)		\
-  if ((cnt) > cur)					\
+  if (expect_false ((cnt) > cur))			\
     {							\
-      int newcnt = cur ? cur << 1 : 16;			\
+      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;					\
     }
 /*****************************************************************************/
-typedef struct
-{
-  struct ev_io *head;
-  unsigned char wev, rev; /* want, received event set */
-} ANFD;
-static ANFD *anfds;
-static int anfdmax;
-static int *fdchanges;
-static int fdchangemax, fdchangecnt;
 static void
 anfds_init (ANFD *base, int count)
 {
   while (count--)
     {
-      base->head = 0;
+      base->head   = 0;
-      base->wev = base->rev = EV_NONE;
+      base->events = EV_NONE;
+      base->reify  = 0;
       ++base;
     }
 }
-typedef struct
-{
-  W w;
-  int events;
-} ANPENDING;
-static ANPENDING *pendings;
-static int pendingmax, pendingcnt;
 static void
-event (W w, int events)
+event (EV_P_ W w, int events)
 {
-  if (w->active)
+  if (w->pending)
     {
-      w->pending = ++pendingcnt;
-      array_needsize (pendings, pendingmax, pendingcnt, );
-      pendings [pendingcnt - 1].w      = w;
-      pendings [pendingcnt - 1].events = events;
+      pendings [ABSPRI (w)][w->pending - 1].events |= events;
+      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;
+}
 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);
+}
+static void
-fd_event (int fd, int events)
+fd_event (EV_P_ int fd, int events)
 {
   ANFD *anfd = anfds + fd;
   struct ev_io *w;
-  for (w = anfd->head; w; w = w->next)
+  for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
     {
       int ev = w->events & events;
       if (ev)
-        event ((W)w, ev);
+        event (EV_A_ (W)w, ev);
     }
 }
+/*****************************************************************************/
 static void
-queue_events (W *events, int eventcnt, int type)
+fd_reify (EV_P)
 {
   int i;
-  for (i = 0; i < eventcnt; ++i)
+  for (i = 0; i < fdchangecnt; ++i)
-    event (events [i], type);
+    {
+      int fd = fdchanges [i];
+      ANFD *anfd = anfds + fd;
+      struct ev_io *w;
+      int events = 0;
+      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);
+          anfd->events = events;
+        }
+    }
+  fdchangecnt = 0;
+}
+static void
+fd_change (EV_P_ int fd)
+{
+  if (anfds [fd].reify || fdchangecnt < 0)
+    return;
+  anfds [fd].reify = 1;
+  ++fdchangecnt;
+  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+  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);
+    }
 }
 /* called on EBADF to verify fds */
 static void
-fd_recheck ()
+fd_ebadf (EV_P)
 {
   int fd;
   for (fd = 0; fd < anfdmax; ++fd)
-    if (anfds [fd].wev)
+    if (anfds [fd].events)
       if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
-        while (anfds [fd].head)
+        fd_kill (EV_A_ fd);
-          evio_stop (anfds [fd].head);
+}
+/* called on ENOMEM in select/poll to kill some fds and retry */
+static void
+fd_enomem (EV_P)
+{
+  int fd = anfdmax;
+  while (fd--)
+    if (anfds [fd].events)
+      {
+        close (fd);
+        fd_kill (EV_A_ fd);
+        return;
+      }
 }
 /*****************************************************************************/
-static struct ev_timer **timers;
-static int timermax, timercnt;
-static struct ev_periodic **periodics;
-static int periodicmax, periodiccnt;
 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;
+      heap [k]->active = k + 1;
       k >>= 1;
     }
-  timers [k] = w;
+  heap [k] = w;
-  timers [k]->active = k + 1;
+  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;
+      heap [k]->active = k + 1;
       k = j;
     }
-  timers [k] = w;
+  heap [k] = w;
-  timers [k]->active = k + 1;
+  heap [k]->active = k + 1;
 }
 /*****************************************************************************/
 typedef struct
 {
-  struct ev_signal *head;
+  struct ev_watcher_list *head;
-  sig_atomic_t gotsig;
+  sig_atomic_t volatile gotsig;
 } ANSIG;
 static ANSIG *signals;
 static int signalmax;
 static int sigpipe [2];
-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;
-static struct ev_io sigev;
 static void
 signals_init (ANSIG *base, int count)
 {
   while (count--)
     {
       base->head   = 0;
       base->gotsig = 0;
       ++base;
     }
 }
 static void
 {
   signals [signum - 1].gotsig = 1;
   if (!gotsig)
     {
+      int old_errno = errno;
       gotsig = 1;
-      write (sigpipe [1], &gotsig, 1);
+      write (sigpipe [1], &signum, 1);
+      errno = old_errno;
     }
 }
 static void
-sigcb (struct ev_io *iow, int revents)
+sigcb (EV_P_ struct ev_io *iow, int revents)
 {
-  struct ev_signal *w;
+  struct ev_watcher_list *w;
-  int sig;
+  int signum;
+  read (sigpipe [0], &revents, 1);
   gotsig = 0;
-  read (sigpipe [0], &revents, 1);
-  for (sig = signalmax; sig--; )
+  for (signum = signalmax; signum--; )
-    if (signals [sig].gotsig)
+    if (signals [signum].gotsig)
       {
-        signals [sig].gotsig = 0;
+        signals [signum].gotsig = 0;
-        for (w = signals [sig].head; w; w = w->next)
+        for (w = signals [signum].head; w; w = w->next)
-          event ((W)w, EV_SIGNAL);
+          event (EV_A_ (W)w, EV_SIGNAL);
       }
 }
 static void
-siginit (void)
+siginit (EV_P)
 {
+#ifndef WIN32
   fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
   /* rather than sort out wether we really need nb, set it */
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
+#endif
-  evio_set (&sigev, sigpipe [0], EV_READ);
+  ev_io_set (&sigev, sigpipe [0], EV_READ);
-  evio_start (&sigev);
+  ev_io_start (EV_A_ &sigev);
+  ev_unref (EV_A); /* child watcher should not keep loop alive */
 }
 /*****************************************************************************/
-static struct ev_idle **idles;
+#ifndef WIN32
-static int idlemax, idlecnt;
-static struct ev_prepare **prepares;
-static int preparemax, preparecnt;
-static struct ev_check **checks;
-static int checkmax, checkcnt;
-/*****************************************************************************/
-static struct ev_child *childs [PID_HASHSIZE];
-static struct ev_signal childev;
 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif
 static void
-childcb (struct ev_signal *sw, int revents)
+child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
 {
   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* */
+        w->rpid     = pid;
+        w->rstatus  = status;
+        event (EV_A_ (W)w, EV_CHILD);
+      }
+}
+static void
+childcb (EV_P_ struct ev_signal *sw, int revents)
+{
   int pid, status;
-  while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
+  if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
-    for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
+    {
-      if (w->pid == pid || w->pid == -1)
+      /* make sure we are called again until all childs have been reaped */
+      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 */
+    }
+}
+#endif
+/*****************************************************************************/
+#if EV_USE_KQUEUE
+# include "ev_kqueue.c"
+#endif
+#if EV_USE_EPOLL
+# include "ev_epoll.c"
+#endif
+#if EV_USEV_POLL
+# include "ev_poll.c"
+#endif
+#if EV_USE_SELECT
+# include "ev_select.c"
+#endif
+int
+ev_version_major (void)
+{
+  return EV_VERSION_MAJOR;
+}
+int
+ev_version_minor (void)
+{
+  return EV_VERSION_MINOR;
+}
+/* return true if we are running with elevated privileges and should ignore env variables */
+static int
+enable_secure (void)
+{
+#ifdef WIN32
+  return 0;
+#else
+  return getuid () != geteuid ()
+      || getgid () != getegid ();
+#endif
+}
+int
+ev_method (EV_P)
+{
+  return method;
+}
+static void
+loop_init (EV_P_ int methods)
+{
+  if (!method)
+    {
+#if EV_USE_MONOTONIC
+      {
+        struct timespec ts;
+        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          have_monotonic = 1;
+      }
+#endif
+      rt_now    = ev_time ();
+      mn_now    = get_clock ();
+      now_floor = mn_now;
+      rtmn_diff = rt_now - mn_now;
+      if (pipe (sigpipe))
+        return 0;
+      if (methods == EVMETHOD_AUTO)
+        if (!enable_secure () && getenv ("LIBmethodS"))
+          methods = atoi (getenv ("LIBmethodS"));
+        else
+          methods = EVMETHOD_ANY;
+      method = 0;
+#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 (!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)
         {
-          w->status = status;
+          ev_watcher_init (&sigev, sigcb);
-          event ((W)w, EV_CHILD);
+          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
         }
+    }
+  return method;
 }
+#ifdef EV_MULTIPLICITY
+struct ev_loop *
+ev_loop_new (int methods)
+{
+  struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
+  loop_init (EV_A_ methods);
+  return loop;
+}
+void
+ev_loop_delete (EV_P)
+{
+  /*TODO*/
+  free (loop);
+}
+#else
+int
+ev_init (int methods)
+{
+  loop_init ();
+}
+#endif
 /*****************************************************************************/
-#if HAVE_EPOLL
+void
-# include "ev_epoll.c"
+ev_fork_prepare (void)
-#endif
-#if HAVE_SELECT
-# include "ev_select.c"
-#endif
-int ev_init (int flags)
-{
-#if HAVE_MONOTONIC
-  {
-    struct timespec ts;
-    if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-      have_monotonic = 1;
-  }
-#endif
-  ev_now = ev_time ();
-  now    = get_clock ();
-  diff   = ev_now - now;
-  if (pipe (sigpipe))
-    return 0;
-  ev_method = EVMETHOD_NONE;
-#if HAVE_EPOLL
-  if (ev_method == EVMETHOD_NONE) epoll_init (flags);
-#endif
-#if HAVE_SELECT
-  if (ev_method == EVMETHOD_NONE) select_init (flags);
-#endif
-  if (ev_method)
-    {
-      evw_init (&sigev, sigcb);
-      siginit ();
-      evsignal_init (&childev, childcb, SIGCHLD);
-      evsignal_start (&childev);
-    }
-  return ev_method;
-}
-/*****************************************************************************/
-void ev_prefork (void)
 {
   /* nop */
 }
+void
-void ev_postfork_parent (void)
+ev_fork_parent (void)
 {
   /* nop */
 }
+void
-void ev_postfork_child (void)
+ev_fork_child (void)
 {
+  /*TODO*/
+#if !EV_MULTIPLICITY
-#if HAVE_EPOLL
+#if EV_USE_EPOLL
-  if (ev_method == EVMETHOD_EPOLL)
+  if (method == EVMETHOD_EPOLL)
-    epoll_postfork_child ();
+    epoll_postfork_child (EV_A);
 #endif
-  evio_stop (&sigev);
+  ev_io_stop (EV_A_ &sigev);
   close (sigpipe [0]);
   close (sigpipe [1]);
   pipe (sigpipe);
-  siginit ();
+  siginit (EV_A);
+#endif
 }
 /*****************************************************************************/
 static void
-fd_reify (void)
+call_pending (EV_P)
 {
-  int i;
+  int pri;
-  for (i = 0; i < fdchangecnt; ++i)
+  for (pri = NUMPRI; pri--; )
-    {
+    while (pendingcnt [pri])
-      int fd = fdchanges [i];
-      ANFD *anfd = anfds + fd;
-      struct ev_io *w;
-      int wev = 0;
-      for (w = anfd->head; w; w = w->next)
-        wev |= w->events;
-      if (anfd->wev != wev)
-        {
+      {
-          method_modify (fd, anfd->wev, wev);
-          anfd->wev = wev;
-        }
-    }
-  fdchangecnt = 0;
-}
-static void
-call_pending ()
-{
-  while (pendingcnt)
-    {
-      ANPENDING *p = pendings + --pendingcnt;
+        ANPENDING *p = pendings [pri] + --pendingcnt [pri];
-      if (p->w)
+        if (p->w)
-        {
+          {
-          p->w->pending = 0;
+            p->w->pending = 0;
-          p->w->cb (p->w, p->events);
+            p->w->cb (EV_A_ p->w, p->events);
-        }
+          }
-    }
+      }
 }
 static void
-timers_reify ()
+timers_reify (EV_P)
 {
-  while (timercnt && timers [0]->at <= now)
+  while (timercnt && timers [0]->at <= mn_now)
     {
       struct ev_timer *w = timers [0];
-      event ((W)w, EV_TIMEOUT);
       /* first reschedule or stop timer */
       if (w->repeat)
         {
+          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
-          w->at = now + w->repeat;
+          w->at = mn_now + w->repeat;
-          assert (("timer timeout in the past, negative repeat?", w->at > now));
           downheap ((WT *)timers, timercnt, 0);
         }
       else
-        evtimer_stop (w); /* nonrepeating: stop timer */
+        ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
-    }
-}
+      event (EV_A_ (W)w, EV_TIMEOUT);
+    }
+}
 static void
-periodics_reify ()
+periodics_reify (EV_P)
 {
-  while (periodiccnt && periodics [0]->at <= ev_now)
+  while (periodiccnt && periodics [0]->at <= rt_now)
     {
       struct ev_periodic *w = periodics [0];
       /* first reschedule or stop timer */
       if (w->interval)
         {
-          w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
+          w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
-          assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
-        evperiodic_stop (w); /* nonrepeating: stop timer */
+        ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
-      event ((W)w, EV_TIMEOUT);
+      event (EV_A_ (W)w, EV_PERIODIC);
     }
 }
 static void
-periodics_reschedule (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->interval)
         {
-          ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
+          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
           if (fabs (diff) >= 1e-4)
             {
-              evperiodic_stop (w);
+              ev_periodic_stop (EV_A_ w);
-              evperiodic_start (w);
+              ev_periodic_start (EV_A_ w);
               i = 0; /* restart loop, inefficient, but time jumps should be rare */
             }
         }
     }
 }
+inline int
+time_update_monotonic (EV_P)
+{
+  mn_now = get_clock ();
+  if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
+    {
+      rt_now = rtmn_diff + mn_now;
+      return 0;
+    }
+  else
+    {
+      now_floor = mn_now;
+      rt_now = ev_time ();
+      return 1;
+    }
+}
 static void
-time_update ()
+time_update (EV_P)
 {
   int i;
-  ev_now = ev_time ();
+#if EV_USE_MONOTONIC
-  if (have_monotonic)
+  if (expect_true (have_monotonic))
     {
-      ev_tstamp odiff = diff;
+      if (time_update_monotonic (EV_A))
-      for (i = 4; --i; ) /* loop a few times, before making important decisions */
         {
-          now = get_clock ();
+          ev_tstamp odiff = rtmn_diff;
+          for (i = 4; --i; ) /* loop a few times, before making important decisions */
+            {
-          diff = ev_now - now;
+              rtmn_diff = rt_now - mn_now;
-          if (fabs (odiff - diff) < MIN_TIMEJUMP)
+              if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
-            return; /* all is well */
+                return; /* all is well */
-          ev_now = ev_time ();
+              rt_now    = ev_time ();
+              mn_now    = get_clock ();
+              now_floor = mn_now;
+            }
+          periodics_reschedule (EV_A);
+          /* no timer adjustment, as the monotonic clock doesn't jump */
+          /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
         }
-      periodics_reschedule (diff - odiff);
-      /* no timer adjustment, as the monotonic clock doesn't jump */
     }
   else
+#endif
     {
-      if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
+      rt_now = ev_time ();
+      if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
         {
-          periodics_reschedule (ev_now - now);
+          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 += diff;
+            timers [i]->at += rt_now - mn_now;
         }
-      now = ev_now;
+      mn_now = rt_now;
     }
 }
-int ev_loop_done;
+void
+ev_ref (EV_P)
+{
+  ++activecnt;
+}
+void
+ev_unref (EV_P)
+{
+  --activecnt;
+}
+static int loop_done;
+void
-void ev_loop (int flags)
+ev_loop (EV_P_ int flags)
 {
   double block;
-  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
+  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
   do
     {
       /* queue check watchers (and execute them) */
-      if (preparecnt)
+      if (expect_false (preparecnt))
         {
-          queue_events ((W *)prepares, preparecnt, EV_PREPARE);
+          queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
-          call_pending ();
+          call_pending (EV_A);
         }
       /* update fd-related kernel structures */
-      fd_reify ();
+      fd_reify (EV_A);
       /* calculate blocking time */
       /* we only need this for !monotonic clockor 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
+        {
-      ev_now = ev_time ();
+          rt_now = ev_time ();
+          mn_now = rt_now;
+        }
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;
       else
         {
           block = MAX_BLOCKTIME;
           if (timercnt)
             {
-              ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;
+              ev_tstamp to = timers [0]->at - mn_now + method_fudge;
               if (block > to) block = to;
             }
           if (periodiccnt)
             {
-              ev_tstamp to = periodics [0]->at - ev_now + method_fudge;
+              ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
               if (block > to) block = to;
             }
           if (block < 0.) block = 0.;
         }
-      method_poll (block);
+      method_poll (EV_A_ block);
-      /* update ev_now, do magic */
+      /* update rt_now, do magic */
-      time_update ();
+      time_update (EV_A);
       /* queue pending timers and reschedule them */
-      timers_reify (); /* relative timers called last */
+      timers_reify (EV_A); /* relative timers called last */
-      periodics_reify (); /* absolute timers called first */
+      periodics_reify (EV_A); /* absolute timers called first */
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)
-        queue_events ((W *)idles, idlecnt, EV_IDLE);
+        queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
       /* queue check watchers, to be executed first */
       if (checkcnt)
-        queue_events ((W *)checks, checkcnt, EV_CHECK);
+        queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
-      call_pending ();
+      call_pending (EV_A);
     }
-  while (!ev_loop_done);
+  while (activecnt && !loop_done);
-  if (ev_loop_done != 2)
+  if (loop_done != 2)
-    ev_loop_done = 0;
+    loop_done = 0;
+}
+void
+ev_unloop (EV_P_ int how)
+{
+  loop_done = how;
 }
 /*****************************************************************************/
-static void
+inline void
 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
-static void
+inline void
 wlist_del (WL *head, WL elem)
 {
   while (*head)
     {
       if (*head == elem)
       head = &(*head)->next;
     }
 }
-static void
+inline void
-ev_clear (W w)
+ev_clear_pending (EV_P_ W w)
 {
   if (w->pending)
     {
-      pendings [w->pending - 1].w = 0;
+      pendings [ABSPRI (w)][w->pending - 1].w = 0;
       w->pending = 0;
     }
 }
-static void
+inline void
-ev_start (W w, int active)
+ev_start (EV_P_ W w, int active)
 {
+  if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
+  if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
   w->active = active;
+  ev_ref (EV_A);
 }
-static void
+inline void
-ev_stop (W w)
+ev_stop (EV_P_ W w)
 {
+  ev_unref (EV_A);
   w->active = 0;
 }
 /*****************************************************************************/
 void
-evio_start (struct ev_io *w)
+ev_io_start (EV_P_ struct ev_io *w)
 {
+  int fd = w->fd;
   if (ev_is_active (w))
     return;
-  int fd = w->fd;
+  assert (("ev_io_start called with negative fd", fd >= 0));
-  ev_start ((W)w, 1);
+  ev_start (EV_A_ (W)w, 1);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
-  ++fdchangecnt;
+  fd_change (EV_A_ fd);
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
-  fdchanges [fdchangecnt - 1] = fd;
 }
 void
-evio_stop (struct ev_io *w)
+ev_io_stop (EV_P_ struct ev_io *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
-  ++fdchangecnt;
+  fd_change (EV_A_ w->fd);
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
-  fdchanges [fdchangecnt - 1] = w->fd;
 }
 void
-evtimer_start (struct ev_timer *w)
+ev_timer_start (EV_P_ struct ev_timer *w)
 {
   if (ev_is_active (w))
     return;
-  w->at += now;
+  w->at += mn_now;
-  assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
+  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
-  ev_start ((W)w, ++timercnt);
+  ev_start (EV_A_ (W)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
 }
 void
-evtimer_stop (struct ev_timer *w)
+ev_timer_stop (EV_P_ struct ev_timer *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
   if (w->active < timercnt--)
     {
       downheap ((WT *)timers, timercnt, w->active - 1);
     }
   w->at = w->repeat;
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
 void
-evtimer_again (struct ev_timer *w)
+ev_timer_again (EV_P_ struct ev_timer *w)
 {
   if (ev_is_active (w))
     {
       if (w->repeat)
         {
-          w->at = now + w->repeat;
+          w->at = mn_now + w->repeat;
           downheap ((WT *)timers, timercnt, w->active - 1);
         }
       else
-        evtimer_stop (w);
+        ev_timer_stop (EV_A_ w);
     }
   else if (w->repeat)
-    evtimer_start (w);
+    ev_timer_start (EV_A_ w);
 }
 void
-evperiodic_start (struct ev_periodic *w)
+ev_periodic_start (EV_P_ struct ev_periodic *w)
 {
   if (ev_is_active (w))
     return;
-  assert (("periodic interval value less than zero not allowed", 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 */
   if (w->interval)
-    w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
+    w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
-  ev_start ((W)w, ++periodiccnt);
+  ev_start (EV_A_ (W)w, ++periodiccnt);
   array_needsize (periodics, periodicmax, periodiccnt, );
   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);
 }
 void
-evperiodic_stop (struct ev_periodic *w)
+ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
   if (w->active < periodiccnt--)
     {
       periodics [w->active - 1] = periodics [periodiccnt];
       downheap ((WT *)periodics, periodiccnt, w->active - 1);
     }
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
 void
-evsignal_start (struct ev_signal *w)
+ev_signal_start (EV_P_ struct ev_signal *w)
 {
   if (ev_is_active (w))
     return;
+  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
-  ev_start ((W)w, 1);
+  ev_start (EV_A_ (W)w, 1);
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
   if (!w->next)
     {
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
-      sa.sa_flags = 0;
+      sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);
     }
 }
 void
-evsignal_stop (struct ev_signal *w)
+ev_signal_stop (EV_P_ struct ev_signal *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (!ev_is_active (w))
     return;
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
   if (!signals [w->signum - 1].head)
     signal (w->signum, SIG_DFL);
 }
+void
-void evidle_start (struct ev_idle *w)
+ev_idle_start (EV_P_ struct ev_idle *w)
 {
   if (ev_is_active (w))
     return;
-  ev_start ((W)w, ++idlecnt);
+  ev_start (EV_A_ (W)w, ++idlecnt);
   array_needsize (idles, idlemax, idlecnt, );
   idles [idlecnt - 1] = w;
 }
+void
-void evidle_stop (struct ev_idle *w)
+ev_idle_stop (EV_P_ struct ev_idle *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (ev_is_active (w))
     return;
   idles [w->active - 1] = idles [--idlecnt];
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
+void
-void evprepare_start (struct ev_prepare *w)
+ev_prepare_start (EV_P_ struct ev_prepare *w)
 {
   if (ev_is_active (w))
     return;
-  ev_start ((W)w, ++preparecnt);
+  ev_start (EV_A_ (W)w, ++preparecnt);
   array_needsize (prepares, preparemax, preparecnt, );
   prepares [preparecnt - 1] = w;
 }
+void
-void evprepare_stop (struct ev_prepare *w)
+ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (ev_is_active (w))
     return;
   prepares [w->active - 1] = prepares [--preparecnt];
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
+void
-void evcheck_start (struct ev_check *w)
+ev_check_start (EV_P_ struct ev_check *w)
 {
   if (ev_is_active (w))
     return;
-  ev_start ((W)w, ++checkcnt);
+  ev_start (EV_A_ (W)w, ++checkcnt);
   array_needsize (checks, checkmax, checkcnt, );
   checks [checkcnt - 1] = w;
 }
+void
-void evcheck_stop (struct ev_check *w)
+ev_check_stop (EV_P_ struct ev_check *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (ev_is_active (w))
     return;
   checks [w->active - 1] = checks [--checkcnt];
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
+void
-void evchild_start (struct ev_child *w)
+ev_child_start (EV_P_ struct ev_child *w)
 {
   if (ev_is_active (w))
     return;
-  ev_start ((W)w, 1);
+  ev_start (EV_A_ (W)w, 1);
   wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
 }
+void
-void evchild_stop (struct ev_child *w)
+ev_child_stop (EV_P_ struct ev_child *w)
 {
-  ev_clear ((W)w);
+  ev_clear_pending (EV_A_ (W)w);
   if (ev_is_active (w))
     return;
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
-  ev_stop ((W)w);
+  ev_stop (EV_A_ (W)w);
 }
 /*****************************************************************************/
 struct ev_once
   void (*cb)(int revents, void *arg);
   void *arg;
 };
 static void
-once_cb (struct ev_once *once, int revents)
+once_cb (EV_P_ struct ev_once *once, int revents)
 {
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
-  evio_stop (&once->io);
+  ev_io_stop (EV_A_ &once->io);
-  evtimer_stop (&once->to);
+  ev_timer_stop (EV_A_ &once->to);
   free (once);
   cb (revents, arg);
 }
 static void
-once_cb_io (struct ev_io *w, int revents)
+once_cb_io (EV_P_ struct ev_io *w, int revents)
 {
-  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+  once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
 }
 static void
-once_cb_to (struct ev_timer *w, int revents)
+once_cb_to (EV_P_ struct ev_timer *w, int revents)
 {
-  once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
+  once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
 }
 void
-ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
+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));
   if (!once)
-    cb (EV_ERROR, arg);
+    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
   else
     {
       once->cb  = cb;
       once->arg = arg;
-      evw_init (&once->io, once_cb_io);
+      ev_watcher_init (&once->io, once_cb_io);
       if (fd >= 0)
         {
-          evio_set (&once->io, fd, events);
+          ev_io_set (&once->io, fd, events);
-          evio_start (&once->io);
+          ev_io_start (EV_A_ &once->io);
         }
-      evw_init (&once->to, once_cb_to);
+      ev_watcher_init (&once->to, once_cb_to);
       if (timeout >= 0.)
         {
-          evtimer_set (&once->to, timeout, 0.);
+          ev_timer_set (&once->to, timeout, 0.);
-          evtimer_start (&once->to);
+          ev_timer_start (EV_A_ &once->to);
         }
     }
 }
 /*****************************************************************************/
 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);
-  evtimer_stop (w);
+  ev_timer_stop (w);
-  evtimer_start (w);
+  ev_timer_start (w);
 }
 static void
 scb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "signal %x,%d\n", revents, w->signum);
-  evio_stop (&wio);
+  ev_io_stop (&wio);
-  evio_start (&wio);
+  ev_io_start (&wio);
 }
 static void
 gcb (struct ev_signal *w, int revents)
 {
 int main (void)
 {
   ev_init (0);
-  evio_init (&wio, sin_cb, 0, EV_READ);
+  ev_io_init (&wio, sin_cb, 0, EV_READ);
-  evio_start (&wio);
+  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;
-      evw_init (w, ocb, i);
+      ev_watcher_init (w, ocb, i);
-      evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
+      ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
-      evtimer_start (w);
+      ev_timer_start (w);
       if (drand48 () < 0.5)
-        evtimer_stop (w);
+        ev_timer_stop (w);
     }
 #endif
   struct ev_timer t1;
-  evtimer_init (&t1, ocb, 5, 10);
+  ev_timer_init (&t1, ocb, 5, 10);
-  evtimer_start (&t1);
+  ev_timer_start (&t1);
   struct ev_signal sig;
-  evsignal_init (&sig, scb, SIGQUIT);
+  ev_signal_init (&sig, scb, SIGQUIT);
-  evsignal_start (&sig);
+  ev_signal_start (&sig);
   struct ev_check cw;
-  evcheck_init (&cw, gcb);
+  ev_check_init (&cw, gcb);
-  evcheck_start (&cw);
+  ev_check_start (&cw);
   struct ev_idle iw;
-  evidle_init (&iw, gcb);
+  ev_idle_init (&iw, gcb);
-  evidle_start (&iw);
+  ev_idle_start (&iw);
   ev_loop (0);
   return 0;
 }

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.22 by root, Wed Oct 31 19:07:43 2007 UTC vs. Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.22 by root, Wed Oct 31 19:07:43 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC