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

Comparing libev/ev.c (file contents):
Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC vs.
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifndef EV_STANDALONE
+# ifdef EV_CONFIG_H
+#  include EV_CONFIG_H
+# else
-# include "config.h"
+#  include "config.h"
+# endif
 # if HAVE_CLOCK_GETTIME
 #  ifndef EV_USE_MONOTONIC
 #   define EV_USE_MONOTONIC 1
 #  endif
 #include <time.h>
 #include <signal.h>
 #ifndef _WIN32
-# include <unistd.h>
 # include <sys/time.h>
 # include <sys/wait.h>
+# include <unistd.h>
 #else
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 # ifndef EV_SELECT_IS_WINSOCKET
 #  define EV_SELECT_IS_WINSOCKET 1
 #ifndef EV_USE_PORT
 # define EV_USE_PORT 0
 #endif
+#ifndef EV_PID_HASHSIZE
+# if EV_MINIMAL
+#  define EV_PID_HASHSIZE 1
+# else
+#  define EV_PID_HASHSIZE 16
+# endif
+#endif
 /**/
-/* darwin simply cannot be helped */
-#ifdef __APPLE__
-# undef EV_USE_POLL
-# undef EV_USE_KQUEUE
-#endif
 #ifndef CLOCK_MONOTONIC
 # undef EV_USE_MONOTONIC
 # define EV_USE_MONOTONIC 0
 #endif
 /**/
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 59.743 /* 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 (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
 #ifdef EV_H
 # include EV_H
 #else
 # include "ev.h"
 #endif
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
+# define inline_size                static inline /* inline for codesize */
+# if EV_MINIMAL
+#  define noinline                  __attribute__ ((noinline))
+#  define inline_speed              static noinline
+# else
+#  define noinline
-# define inline                     static inline
+#  define inline_speed              static inline
+# endif
 #else
 # define expect(expr,value)         (expr)
+# define inline_speed               static
-# define inline                     static
+# define inline_size                static
+# define noinline
 #endif
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 #define ABSPRI(w) ((w)->priority - EV_MINPRI)
 #define EMPTY0      /* required for microsofts broken pseudo-c compiler */
 #define EMPTY2(a,b) /* used to suppress some warnings */
-typedef struct ev_watcher *W;
+typedef ev_watcher *W;
-typedef struct ev_watcher_list *WL;
+typedef ev_watcher_list *WL;
-typedef struct ev_watcher_time *WT;
+typedef ev_watcher_time *WT;
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 #ifdef _WIN32
 # include "ev_win32.c"
 /*****************************************************************************/
 static void (*syserr_cb)(const char *msg);
+void
-void ev_set_syserr_cb (void (*cb)(const char *msg))
+ev_set_syserr_cb (void (*cb)(const char *msg))
 {
   syserr_cb = cb;
 }
-static void
+static void noinline
 syserr (const char *msg)
 {
   if (!msg)
     msg = "(libev) system error";
     }
 }
 static void *(*alloc)(void *ptr, long size);
+void
-void ev_set_allocator (void *(*cb)(void *ptr, long size))
+ev_set_allocator (void *(*cb)(void *ptr, long size))
 {
   alloc = cb;
 }
 static void *
   gettimeofday (&tv, 0);
   return tv.tv_sec + tv.tv_usec * 1e-6;
 #endif
 }
-inline ev_tstamp
+ev_tstamp inline_size
 get_clock (void)
 {
 #if EV_USE_MONOTONIC
   if (expect_true (have_monotonic))
     {
 #define array_free(stem, idx) \
   ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
 /*****************************************************************************/
-static void
+void noinline
-anfds_init (ANFD *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->events = EV_NONE;
-      base->reify  = 0;
-      ++base;
-    }
-}
-void
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
   if (expect_false (w_->pending))
   array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
   pendings [ABSPRI (w_)][w_->pending - 1].w      = w_;
   pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
 }
-static void
+void inline_size
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
   for (i = 0; i < eventcnt; ++i)
     ev_feed_event (EV_A_ events [i], type);
 }
-inline void
+/*****************************************************************************/
+void inline_size
+anfds_init (ANFD *base, int count)
+{
+  while (count--)
+    {
+      base->head   = 0;
+      base->events = EV_NONE;
+      base->reify  = 0;
+      ++base;
+    }
+}
+void inline_speed
 fd_event (EV_P_ int fd, int revents)
 {
   ANFD *anfd = anfds + fd;
-  struct ev_io *w;
+  ev_io *w;
-  for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
+  for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
     {
       int ev = w->events & revents;
       if (ev)
         ev_feed_event (EV_A_ (W)w, ev);
 ev_feed_fd_event (EV_P_ int fd, int revents)
 {
   fd_event (EV_A_ fd, revents);
 }
-/*****************************************************************************/
+void inline_size
-inline void
 fd_reify (EV_P)
 {
   int i;
   for (i = 0; i < fdchangecnt; ++i)
     {
       int fd = fdchanges [i];
       ANFD *anfd = anfds + fd;
-      struct ev_io *w;
+      ev_io *w;
       int events = 0;
-      for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
+      for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
         events |= w->events;
 #if EV_SELECT_IS_WINSOCKET
       if (events)
         {
         }
 #endif
       anfd->reify = 0;
-      method_modify (EV_A_ fd, anfd->events, events);
+      backend_modify (EV_A_ fd, anfd->events, events);
       anfd->events = events;
     }
   fdchangecnt = 0;
 }
-static void
+void inline_size
 fd_change (EV_P_ int fd)
 {
   if (expect_false (anfds [fd].reify))
     return;
   ++fdchangecnt;
   array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
   fdchanges [fdchangecnt - 1] = fd;
 }
-static void
+void inline_speed
 fd_kill (EV_P_ int fd)
 {
-  struct ev_io *w;
+  ev_io *w;
-  while ((w = (struct ev_io *)anfds [fd].head))
+  while ((w = (ev_io *)anfds [fd].head))
     {
       ev_io_stop (EV_A_ w);
       ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
     }
 }
-inline int
+int inline_size
 fd_valid (int fd)
 {
 #ifdef _WIN32
   return _get_osfhandle (fd) != -1;
 #else
   return fcntl (fd, F_GETFD) != -1;
 #endif
 }
 /* called on EBADF to verify fds */
-static void
+static void noinline
 fd_ebadf (EV_P)
 {
   int fd;
   for (fd = 0; fd < anfdmax; ++fd)
       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
+static void noinline
 fd_enomem (EV_P)
 {
   int fd;
   for (fd = anfdmax; fd--; )
         fd_kill (EV_A_ fd);
         return;
       }
 }
-/* usually called after fork if method needs to re-arm all fds from scratch */
+/* usually called after fork if backend needs to re-arm all fds from scratch */
-static void
+static void noinline
 fd_rearm_all (EV_P)
 {
   int fd;
   /* this should be highly optimised to not do anything but set a flag */
       }
 }
 /*****************************************************************************/
-static void
+void inline_speed
 upheap (WT *heap, int k)
 {
   WT w = heap [k];
   while (k && heap [k >> 1]->at > w->at)
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
 }
-static void
+void inline_speed
 downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];
   while (k < (N >> 1))
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
 }
-inline void
+void inline_size
 adjustheap (WT *heap, int N, int k)
 {
   upheap (heap, k);
   downheap (heap, N, k);
 }
 static ANSIG *signals;
 static int signalmax;
 static int sigpipe [2];
 static sig_atomic_t volatile gotsig;
-static struct ev_io sigev;
+static ev_io sigev;
-static void
+void inline_size
 signals_init (ANSIG *base, int count)
 {
   while (count--)
     {
       base->head   = 0;
       write (sigpipe [1], &signum, 1);
       errno = old_errno;
     }
 }
-void
+void noinline
 ev_feed_signal_event (EV_P_ int signum)
 {
   WL w;
 #if EV_MULTIPLICITY
   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)
+sigcb (EV_P_ ev_io *iow, int revents)
 {
   int signum;
   read (sigpipe [0], &revents, 1);
   gotsig = 0;
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
-static void
+void inline_size
 fd_intern (int fd)
 {
 #ifdef _WIN32
   int arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   fcntl (fd, F_SETFL, O_NONBLOCK);
 #endif
 }
-static void
+static void noinline
 siginit (EV_P)
 {
   fd_intern (sigpipe [0]);
   fd_intern (sigpipe [1]);
   ev_unref (EV_A); /* child watcher should not keep loop alive */
 }
 /*****************************************************************************/
-static struct ev_child *childs [PID_HASHSIZE];
+static ev_child *childs [EV_PID_HASHSIZE];
 #ifndef _WIN32
-static struct ev_signal childev;
+static ev_signal childev;
-#ifndef WCONTINUED
+void inline_speed
-# define WCONTINUED 0
-#endif
-static void
-child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
+child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
 {
-  struct ev_child *w;
+  ev_child *w;
-  for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
+  for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {
         ev_priority (w) = ev_priority (sw); /* need to do it *now* */
         w->rpid         = pid;
         w->rstatus      = status;
         ev_feed_event (EV_A_ (W)w, EV_CHILD);
       }
 }
+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
 static void
-childcb (EV_P_ struct ev_signal *sw, int revents)
+childcb (EV_P_ ev_signal *sw, int revents)
 {
   int pid, status;
+  /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
-  if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
+  if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
-    {
+    if (!WCONTINUED
+        || errno != EINVAL
+        || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
+      return;
-      /* make sure we are called again until all childs have been reaped */
+  /* make sure we are called again until all childs have been reaped */
+  /* we need to do it this way so that the callback gets called before we continue */
-      ev_feed_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, pid, pid, status);
+  if (EV_PID_HASHSIZE > 1)
-      child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */
+    child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
-    }
 }
 #endif
 /*****************************************************************************/
 {
   return EV_VERSION_MINOR;
 }
 /* return true if we are running with elevated privileges and should ignore env variables */
-static int
+int inline_size
 enable_secure (void)
 {
 #ifdef _WIN32
   return 0;
 #else
       || getgid () != getegid ();
 #endif
 }
 unsigned int
-ev_method (EV_P)
+ev_supported_backends (void)
 {
-  return method;
+  unsigned int flags = 0;
+  if (EV_USE_PORT  ) flags |= EVBACKEND_PORT;
+  if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
+  if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
+  if (EV_USE_POLL  ) flags |= EVBACKEND_POLL;
+  if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
+  return flags;
+}
+unsigned int
+ev_recommended_backends (void)
+{
+  unsigned int flags = ev_supported_backends ();
+#ifndef __NetBSD__
+  /* kqueue is borked on everything but netbsd apparently */
+  /* it usually doesn't work correctly on anything but sockets and pipes */
+  flags &= ~EVBACKEND_KQUEUE;
+#endif
+#ifdef __APPLE__
+  // flags &= ~EVBACKEND_KQUEUE; for documentation
+  flags &= ~EVBACKEND_POLL;
+#endif
+  return flags;
+}
+unsigned int
+ev_embeddable_backends (void)
+{
+  return EVBACKEND_EPOLL
+       | EVBACKEND_KQUEUE
+       | EVBACKEND_PORT;
+}
+unsigned int
+ev_backend (EV_P)
+{
+  return backend;
 }
 static void
 loop_init (EV_P_ unsigned int flags)
 {
-  if (!method)
+  if (!backend)
     {
 #if EV_USE_MONOTONIC
       {
         struct timespec ts;
         if (!clock_gettime (CLOCK_MONOTONIC, &ts))
       if (!(flags & EVFLAG_NOENV)
           && !enable_secure ()
           && getenv ("LIBEV_FLAGS"))
         flags = atoi (getenv ("LIBEV_FLAGS"));
-      if (!(flags & EVMETHOD_ALL))
+      if (!(flags & 0x0000ffffUL))
-        {
+        flags |= ev_recommended_backends ();
-          flags |= EVMETHOD_ALL;
-#if EV_USE_KQUEUE && !defined (__NetBSD__)
-          /* kqueue is borked on everything but netbsd apparently */
-          /* it usually doesn't work correctly on anything but sockets and pipes */
-          flags &= ~EVMETHOD_KQUEUE;
-#endif
-        }
-      method = 0;
+      backend = 0;
 #if EV_USE_PORT
-      if (!method && (flags & EVMETHOD_PORT  )) method = port_init   (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_PORT  )) backend = port_init   (EV_A_ flags);
 #endif
 #if EV_USE_KQUEUE
-      if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
 #endif
 #if EV_USE_EPOLL
-      if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init  (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init  (EV_A_ flags);
 #endif
 #if EV_USE_POLL
-      if (!method && (flags & EVMETHOD_POLL  )) method = poll_init   (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_POLL  )) backend = poll_init   (EV_A_ flags);
 #endif
 #if EV_USE_SELECT
-      if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
+      if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
 #endif
       ev_init (&sigev, sigcb);
       ev_set_priority (&sigev, EV_MAXPRI);
     }
 loop_destroy (EV_P)
 {
   int i;
 #if EV_USE_PORT
-  if (method == EVMETHOD_PORT  ) port_destroy   (EV_A);
+  if (backend == EVBACKEND_PORT  ) port_destroy   (EV_A);
 #endif
 #if EV_USE_KQUEUE
-  if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
+  if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
 #endif
 #if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL ) epoll_destroy  (EV_A);
+  if (backend == EVBACKEND_EPOLL ) epoll_destroy  (EV_A);
 #endif
 #if EV_USE_POLL
-  if (method == EVMETHOD_POLL  ) poll_destroy   (EV_A);
+  if (backend == EVBACKEND_POLL  ) poll_destroy   (EV_A);
 #endif
 #if EV_USE_SELECT
-  if (method == EVMETHOD_SELECT) select_destroy (EV_A);
+  if (backend == EVBACKEND_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 (fdchange, EMPTY0);
   array_free (timer, EMPTY0);
-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY0);
 #endif
   array_free (idle, EMPTY0);
   array_free (prepare, EMPTY0);
   array_free (check, EMPTY0);
-  method = 0;
+  backend = 0;
 }
 static void
 loop_fork (EV_P)
 {
 #if EV_USE_PORT
-  if (method == EVMETHOD_PORT  ) port_fork   (EV_A);
+  if (backend == EVBACKEND_PORT  ) port_fork   (EV_A);
 #endif
 #if EV_USE_KQUEUE
-  if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
+  if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
 #endif
 #if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
+  if (backend == EVBACKEND_EPOLL ) epoll_fork  (EV_A);
 #endif
   if (ev_is_active (&sigev))
     {
       /* default loop */
   memset (loop, 0, sizeof (struct ev_loop));
   loop_init (EV_A_ flags);
-  if (ev_method (EV_A))
+  if (ev_backend (EV_A))
     return loop;
   return 0;
 }
       ev_default_loop_ptr = 1;
 #endif
       loop_init (EV_A_ flags);
-      if (ev_method (EV_A))
+      if (ev_backend (EV_A))
         {
           siginit (EV_A);
 #ifndef _WIN32
           ev_signal_init (&childev, childcb, SIGCHLD);
 {
 #if EV_MULTIPLICITY
   struct ev_loop *loop = ev_default_loop_ptr;
 #endif
-  if (method)
+  if (backend)
     postfork = 1;
 }
 /*****************************************************************************/
-static int
+int inline_size
 any_pending (EV_P)
 {
   int pri;
   for (pri = NUMPRI; pri--; )
       return 1;
   return 0;
 }
-inline void
+void inline_speed
 call_pending (EV_P)
 {
   int pri;
   for (pri = NUMPRI; pri--; )
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
         if (expect_true (p->w))
           {
+            assert (("non-pending watcher on pending list", p->w->pending));
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);
           }
       }
 }
-inline void
+void inline_size
 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {
-      struct ev_timer *w = timers [0];
+      ev_timer *w = timers [0];
       assert (("inactive timer on timer heap detected", ev_is_active (w)));
       /* first reschedule or stop timer */
       if (w->repeat)
       ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
     }
 }
-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE
-inline void
+void inline_size
 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {
-      struct ev_periodic *w = periodics [0];
+      ev_periodic *w = periodics [0];
       assert (("inactive timer on periodic heap detected", ev_is_active (w)));
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
       ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
     }
 }
-static void
+static void noinline
 periodics_reschedule (EV_P)
 {
   int i;
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {
-      struct ev_periodic *w = periodics [i];
+      ev_periodic *w = periodics [i];
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
       else if (w->interval)
         ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
   for (i = periodiccnt >> 1; i--; )
     downheap ((WT *)periodics, periodiccnt, i);
 }
 #endif
-inline int
+int inline_size
 time_update_monotonic (EV_P)
 {
   mn_now = get_clock ();
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
       ev_rt_now = ev_time ();
       return 1;
     }
 }
-inline void
+void inline_size
 time_update (EV_P)
 {
   int i;
 #if EV_USE_MONOTONIC
     {
       if (time_update_monotonic (EV_A))
         {
           ev_tstamp odiff = rtmn_diff;
-          for (i = 4; --i; ) /* loop a few times, before making important decisions */
+          /* loop a few times, before making important decisions.
+           * on the choice of "4": one iteration isn't enough,
+           * in case we get preempted during the calls to
+           * ev_time and get_clock. a second call is almost guarenteed
+           * to succeed in that case, though. and looping a few more times
+           * doesn't hurt either as we only do this on time-jumps or
+           * in the unlikely event of getting preempted here.
+           */
+          for (i = 4; --i; )
             {
               rtmn_diff = ev_rt_now - mn_now;
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
               ev_rt_now = ev_time ();
               mn_now    = get_clock ();
               now_floor = mn_now;
             }
-# if EV_PERIODICS
+# if EV_PERIODIC_ENABLE
           periodics_reschedule (EV_A);
 # endif
           /* no timer adjustment, as the monotonic clock doesn't jump */
           /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
         }
     {
       ev_rt_now = ev_time ();
       if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
         {
-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE
           periodics_reschedule (EV_A);
 #endif
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
 static int loop_done;
 void
 ev_loop (EV_P_ int flags)
 {
-  double block;
-  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
+  loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
+            ? EVUNLOOP_ONE
+            : EVUNLOOP_CANCEL;
   while (activecnt)
     {
+      /* we might have forked, so reify kernel state if necessary */
+      #if EV_FORK_ENABLE
+        if (expect_false (postfork))
+          if (forkcnt)
+            {
+              queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
+              call_pending (EV_A);
+            }
+      #endif
       /* queue check watchers (and execute them) */
       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
       /* update fd-related kernel structures */
       fd_reify (EV_A);
       /* calculate blocking time */
+      {
+        double block;
-      /* we only need this for !monotonic clock or timers, but as we basically
+        if (flags & EVLOOP_NONBLOCK || idlecnt)
-         always have timers, we just calculate it always */
+          block = 0.; /* do not block at all */
+        else
+          {
+            /* update time to cancel out callback processing overhead */
 #if EV_USE_MONOTONIC
-      if (expect_true (have_monotonic))
+            if (expect_true (have_monotonic))
-        time_update_monotonic (EV_A);
+              time_update_monotonic (EV_A);
-      else
+            else
 #endif
-        {
+              {
-          ev_rt_now = ev_time ();
+                ev_rt_now = ev_time ();
-          mn_now    = ev_rt_now;
+                mn_now    = ev_rt_now;
-        }
+              }
-      if (flags & EVLOOP_NONBLOCK || idlecnt)
-        block = 0.;
-      else
-        {
-          block = MAX_BLOCKTIME;
+            block = MAX_BLOCKTIME;
-          if (timercnt)
+            if (timercnt)
-            {
+              {
-              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
+                ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
-              if (block > to) block = to;
+                if (block > to) block = to;
-            }
+              }
-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE
-          if (periodiccnt)
+            if (periodiccnt)
-            {
+              {
-              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
+                ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
-              if (block > to) block = to;
+                if (block > to) block = to;
-            }
+              }
 #endif
-          if (expect_false (block < 0.)) block = 0.;
+            if (expect_false (block < 0.)) block = 0.;
-        }
+          }
-      method_poll (EV_A_ block);
+        backend_poll (EV_A_ block);
+      }
       /* 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
+#if EV_PERIODIC_ENABLE
       periodics_reify (EV_A); /* absolute timers called first */
 #endif
-      /* queue idle watchers unless io or timers are pending */
+      /* queue idle watchers unless other events are pending */
       if (idlecnt && !any_pending (EV_A))
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
       /* queue check watchers, to be executed first */
       if (expect_false (checkcnt))
       if (expect_false (loop_done))
         break;
     }
-  if (loop_done != 2)
+  if (loop_done == EVUNLOOP_ONE)
-    loop_done = 0;
+    loop_done = EVUNLOOP_CANCEL;
 }
 void
 ev_unloop (EV_P_ int how)
 {
   loop_done = how;
 }
 /*****************************************************************************/
-inline void
+void inline_size
 wlist_add (WL *head, WL elem)
 {
   elem->next = *head;
   *head = elem;
 }
-inline void
+void inline_size
 wlist_del (WL *head, WL elem)
 {
   while (*head)
     {
       if (*head == elem)
       head = &(*head)->next;
     }
 }
-inline void
+void inline_speed
 ev_clear_pending (EV_P_ W w)
 {
   if (w->pending)
     {
       pendings [ABSPRI (w)][w->pending - 1].w = 0;
       w->pending = 0;
     }
 }
-inline void
+void inline_speed
 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);
 }
-inline void
+void inline_size
 ev_stop (EV_P_ W w)
 {
   ev_unref (EV_A);
   w->active = 0;
 }
 /*****************************************************************************/
 void
-ev_io_start (EV_P_ struct ev_io *w)
+ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;
   if (expect_false (ev_is_active (w)))
     return;
   fd_change (EV_A_ fd);
 }
 void
-ev_io_stop (EV_P_ struct ev_io *w)
+ev_io_stop (EV_P_ ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   fd_change (EV_A_ w->fd);
 }
 void
-ev_timer_start (EV_P_ struct ev_timer *w)
+ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
   ((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 (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
+  array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
   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_timer_stop (EV_P_ ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   ev_stop (EV_A_ (W)w);
 }
 void
-ev_timer_again (EV_P_ struct ev_timer *w)
+ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))
     {
       if (w->repeat)
         {
       w->at = w->repeat;
       ev_timer_start (EV_A_ w);
     }
 }
-#if EV_PERIODICS
+#if EV_PERIODIC_ENABLE
 void
-ev_periodic_start (EV_P_ struct ev_periodic *w)
+ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
   if (w->reschedule_cb)
       /* this formula differs from the one in periodic_reify because we do not always round up */
       ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
     }
   ev_start (EV_A_ (W)w, ++periodiccnt);
-  array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
+  array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
   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_periodic_stop (EV_P_ ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   ev_stop (EV_A_ (W)w);
 }
 void
-ev_periodic_again (EV_P_ struct ev_periodic *w)
+ev_periodic_again (EV_P_ 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 (expect_false (ev_is_active (w)))
-    return;
-  ev_start (EV_A_ (W)w, ++idlecnt);
-  array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
-  idles [idlecnt - 1] = w;
-}
-void
-ev_idle_stop (EV_P_ struct ev_idle *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (expect_false (!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 (expect_false (ev_is_active (w)))
-    return;
-  ev_start (EV_A_ (W)w, ++preparecnt);
-  array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
-  prepares [preparecnt - 1] = w;
-}
-void
-ev_prepare_stop (EV_P_ struct ev_prepare *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (expect_false (!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 (expect_false (ev_is_active (w)))
-    return;
-  ev_start (EV_A_ (W)w, ++checkcnt);
-  array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
-  checks [checkcnt - 1] = w;
-}
-void
-ev_check_stop (EV_P_ struct ev_check *w)
-{
-  ev_clear_pending (EV_A_ (W)w);
-  if (expect_false (!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)
+ev_signal_start (EV_P_ ev_signal *w)
 {
 #if EV_MULTIPLICITY
   assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
 #endif
     }
 }
 void
-ev_signal_stop (EV_P_ struct ev_signal *w)
+ev_signal_stop (EV_P_ ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   if (!signals [w->signum - 1].head)
     signal (w->signum, SIG_DFL);
 }
 void
-ev_child_start (EV_P_ struct ev_child *w)
+ev_child_start (EV_P_ ev_child *w)
 {
 #if EV_MULTIPLICITY
   assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
   if (expect_false (ev_is_active (w)))
     return;
   ev_start (EV_A_ (W)w, 1);
-  wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
 }
 void
-ev_child_stop (EV_P_ struct ev_child *w)
+ev_child_stop (EV_P_ ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
-  wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
 }
+#if EV_STAT_ENABLE
+# ifdef _WIN32
+#  undef lstat
+#  define lstat(a,b) _stati64 (a,b)
+# endif
+#define DEF_STAT_INTERVAL 5.0074891
+#define MIN_STAT_INTERVAL 0.1074891
+void
+ev_stat_stat (EV_P_ ev_stat *w)
+{
+  if (lstat (w->path, &w->attr) < 0)
+    w->attr.st_nlink = 0;
+  else if (!w->attr.st_nlink)
+    w->attr.st_nlink = 1;
+}
+static void
+stat_timer_cb (EV_P_ ev_timer *w_, int revents)
+{
+  ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
+  /* we copy this here each the time so that */
+  /* prev has the old value when the callback gets invoked */
+  w->prev = w->attr;
+  ev_stat_stat (EV_A_ w);
+  if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
+    ev_feed_event (EV_A_ w, EV_STAT);
+}
+void
+ev_stat_start (EV_P_ ev_stat *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  /* since we use memcmp, we need to clear any padding data etc. */
+  memset (&w->prev, 0, sizeof (ev_statdata));
+  memset (&w->attr, 0, sizeof (ev_statdata));
+  ev_stat_stat (EV_A_ w);
+  if (w->interval < MIN_STAT_INTERVAL)
+    w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
+  ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
+  ev_set_priority (&w->timer, ev_priority (w));
+  ev_timer_start (EV_A_ &w->timer);
+  ev_start (EV_A_ (W)w, 1);
+}
+void
+ev_stat_stop (EV_P_ ev_stat *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  ev_timer_stop (EV_A_ &w->timer);
+  ev_stop (EV_A_ (W)w);
+}
+#endif
+void
+ev_idle_start (EV_P_ ev_idle *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  ev_start (EV_A_ (W)w, ++idlecnt);
+  array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
+  idles [idlecnt - 1] = w;
+}
+void
+ev_idle_stop (EV_P_ ev_idle *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  {
+    int active = ((W)w)->active;
+    idles [active - 1] = idles [--idlecnt];
+    ((W)idles [active - 1])->active = active;
+  }
+  ev_stop (EV_A_ (W)w);
+}
+void
+ev_prepare_start (EV_P_ ev_prepare *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  ev_start (EV_A_ (W)w, ++preparecnt);
+  array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
+  prepares [preparecnt - 1] = w;
+}
+void
+ev_prepare_stop (EV_P_ ev_prepare *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  {
+    int active = ((W)w)->active;
+    prepares [active - 1] = prepares [--preparecnt];
+    ((W)prepares [active - 1])->active = active;
+  }
+  ev_stop (EV_A_ (W)w);
+}
+void
+ev_check_start (EV_P_ ev_check *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  ev_start (EV_A_ (W)w, ++checkcnt);
+  array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
+  checks [checkcnt - 1] = w;
+}
+void
+ev_check_stop (EV_P_ ev_check *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  {
+    int active = ((W)w)->active;
+    checks [active - 1] = checks [--checkcnt];
+    ((W)checks [active - 1])->active = active;
+  }
+  ev_stop (EV_A_ (W)w);
+}
+#if EV_EMBED_ENABLE
+void noinline
+ev_embed_sweep (EV_P_ ev_embed *w)
+{
+  ev_loop (w->loop, EVLOOP_NONBLOCK);
+}
+static void
+embed_cb (EV_P_ ev_io *io, int revents)
+{
+  ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
+  if (ev_cb (w))
+    ev_feed_event (EV_A_ (W)w, EV_EMBED);
+  else
+    ev_embed_sweep (loop, w);
+}
+void
+ev_embed_start (EV_P_ ev_embed *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  {
+    struct ev_loop *loop = w->loop;
+    assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
+    ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
+  }
+  ev_set_priority (&w->io, ev_priority (w));
+  ev_io_start (EV_A_ &w->io);
+  ev_start (EV_A_ (W)w, 1);
+}
+void
+ev_embed_stop (EV_P_ ev_embed *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  ev_io_stop (EV_A_ &w->io);
+  ev_stop (EV_A_ (W)w);
+}
+#endif
+#if EV_FORK_ENABLE
+void
+ev_fork_start (EV_P_ ev_fork *w)
+{
+  if (expect_false (ev_is_active (w)))
+    return;
+  ev_start (EV_A_ (W)w, ++forkcnt);
+  array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
+  forks [forkcnt - 1] = w;
+}
+void
+ev_fork_stop (EV_P_ ev_fork *w)
+{
+  ev_clear_pending (EV_A_ (W)w);
+  if (expect_false (!ev_is_active (w)))
+    return;
+  {
+    int active = ((W)w)->active;
+    forks [active - 1] = forks [--forkcnt];
+    ((W)forks [active - 1])->active = active;
+  }
+  ev_stop (EV_A_ (W)w);
+}
+#endif
 /*****************************************************************************/
 struct ev_once
 {
-  struct ev_io io;
+  ev_io io;
-  struct ev_timer to;
+  ev_timer to;
   void (*cb)(int revents, void *arg);
   void *arg;
 };
 static void
   cb (revents, arg);
 }
 static void
-once_cb_io (EV_P_ struct ev_io *w, int revents)
+once_cb_io (EV_P_ ev_io *w, int revents)
 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
 }
 static void
-once_cb_to (EV_P_ struct ev_timer *w, int revents)
+once_cb_to (EV_P_ ev_timer *w, int revents)
 {
   once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
 }
 void

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC vs. Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.128 by root, Thu Nov 22 12:28:27 2007 UTC vs.
Revision 1.149 by root, Tue Nov 27 19:23:31 2007 UTC