*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 96d297ceb37487789a2fb91ab3c6be6904cc6e15..8911cb8466145287be2f6b82f6537ae5bdb36257 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -158,6 +158,14 @@ extern "C" {
 # define EV_USE_PORT 0
 #endif
 
 # 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
+

 /**/
 
 #ifndef CLOCK_MONOTONIC
 /**/
 
 #ifndef CLOCK_MONOTONIC


@@ -178,7 +186,6 @@ extern "C" {
 
 #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 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
 /*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
 
 #ifdef EV_H


@@ -200,7 +207,7 @@ extern "C" {
 #else
 # define expect(expr,value)         (expr)
 # define inline_speed               static
 #else
 # define expect(expr,value)         (expr)
 # define inline_speed               static

-# define inline_minimal             static
+# define inline_size                static

 # define noinline
 #endif
 
 # define noinline
 #endif
 


@@ -227,12 +234,13 @@ static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 static void (*syserr_cb)(const char *msg);
 
 
 static void (*syserr_cb)(const char *msg);
 

-void ev_set_syserr_cb (void (*cb)(const char *msg))
+void
+ev_set_syserr_cb (void (*cb)(const char *msg))

 {
   syserr_cb = cb;
 }
 
 {
   syserr_cb = cb;
 }
 

-static void
+static void noinline

 syserr (const char *msg)
 {
   if (!msg)
 syserr (const char *msg)
 {
   if (!msg)


@@ -249,7 +257,8 @@ syserr (const char *msg)
 
 static void *(*alloc)(void *ptr, long size);
 
 
 static void *(*alloc)(void *ptr, long size);
 

-void ev_set_allocator (void *(*cb)(void *ptr, long size))
+void
+ev_set_allocator (void *(*cb)(void *ptr, long size))

 {
   alloc = cb;
 }
 {
   alloc = cb;
 }


@@ -317,7 +326,7 @@ typedef struct
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-ev_tstamp noinline
+ev_tstamp

 ev_time (void)
 {
 #if EV_USE_REALTIME
 ev_time (void)
 {
 #if EV_USE_REALTIME


@@ -384,19 +393,6 @@ ev_now (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-void inline_size
-anfds_init (ANFD *base, int count)
-{
-  while (count--)
-    {
-      base->head   = 0;
-      base->events = EV_NONE;
-      base->reify  = 0;
-
-      ++base;
-    }
-}
-

 void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {
 void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {


@@ -414,7 +410,7 @@ ev_feed_event (EV_P_ void *w, int revents)
   pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
 }
 
   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;
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;


@@ -423,6 +419,21 @@ queue_events (EV_P_ W *events, int eventcnt, int type)
     ev_feed_event (EV_A_ events [i], type);
 }
 
     ev_feed_event (EV_A_ events [i], type);
 }
 

+/*****************************************************************************/
+
+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)
 {
 void inline_speed
 fd_event (EV_P_ int fd, int revents)
 {


@@ -444,8 +455,6 @@ ev_feed_fd_event (EV_P_ int fd, int revents)
   fd_event (EV_A_ fd, revents);
 }
 
   fd_event (EV_A_ fd, revents);
 }
 

-/*****************************************************************************/
-

 void inline_size
 fd_reify (EV_P)
 {
 void inline_size
 fd_reify (EV_P)
 {


@@ -709,22 +718,18 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static ev_child *childs [PID_HASHSIZE];
+static ev_child *childs [EV_PID_HASHSIZE];

 
 #ifndef _WIN32
 
 static ev_signal childev;
 
 
 #ifndef _WIN32
 
 static ev_signal childev;
 

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

 void inline_speed
 child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
 {
   ev_child *w;
 
 void inline_speed
 child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
 {
   ev_child *w;
 

-  for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (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* */
     if (w->pid == pid || !w->pid)
       {
         ev_priority (w) = ev_priority (sw); /* need to do it *now* */


@@ -734,20 +739,29 @@ child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
       }
 }
 
       }
 }
 

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

 static void
 childcb (EV_P_ ev_signal *sw, int revents)
 {
   int pid, status;
 
 static void
 childcb (EV_P_ 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 */
-      /* 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);
+  /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
+  if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
+    if (!WCONTINUED
+        || errno != EINVAL
+        || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
+      return;

 
 

-      child_reap (EV_A_ sw, pid, pid, status);
-      child_reap (EV_A_ sw,   0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
-    }
+  /* 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);
+
+  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 feed_event catches that */

 }
 
 #endif
 }
 
 #endif


@@ -1272,6 +1286,16 @@ ev_loop (EV_P_ int flags)
 
   while (activecnt)
     {
 
   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 check watchers (and execute them) */
       if (expect_false (preparecnt))
         {


@@ -1554,73 +1578,158 @@ ev_periodic_again (EV_P_ ev_periodic *w)
 }
 #endif
 
 }
 #endif
 

+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+

 void
 void

-ev_idle_start (EV_P_ ev_idle *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)))
     return;
 
   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;
+  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+
+  ev_start (EV_A_ (W)w, 1);
+  array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
+
+  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
 }
 
 void

-ev_idle_stop (EV_P_ ev_idle *w)
+ev_signal_stop (EV_P_ ev_signal *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 
 {
   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;
-  }
+  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
+  ev_stop (EV_A_ (W)w);
+
+  if (!signals [w->signum - 1].head)
+    signal (w->signum, SIG_DFL);
+}
+
+void
+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 & (EV_PID_HASHSIZE - 1)], (WL)w);
+}
+
+void
+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 & (EV_PID_HASHSIZE - 1)], (WL)w);

   ev_stop (EV_A_ (W)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
 void

-ev_prepare_start (EV_P_ ev_prepare *w)
+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;
 
 {
   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;
+  /* 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
 }
 
 void

-ev_prepare_stop (EV_P_ ev_prepare *w)
+ev_stat_stop (EV_P_ ev_stat *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 
 {
   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_timer_stop (EV_A_ &w->timer);

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

+#endif

 
 void
 
 void

-ev_check_start (EV_P_ ev_check *w)
+ev_idle_start (EV_P_ ev_idle *w)

 {
   if (expect_false (ev_is_active (w)))
     return;
 
 {
   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;
+  ev_start (EV_A_ (W)w, ++idlecnt);
+  array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
+  idles [idlecnt - 1] = w;

 }
 
 void
 }
 
 void

-ev_check_stop (EV_P_ ev_check *w)
+ev_idle_stop (EV_P_ ev_idle *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))


@@ -1628,81 +1737,64 @@ ev_check_stop (EV_P_ ev_check *w)
 
   {
     int active = ((W)w)->active;
 
   {
     int active = ((W)w)->active;

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

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

-#ifndef SA_RESTART
-# define SA_RESTART 0
-#endif
-

 void
 void

-ev_signal_start (EV_P_ ev_signal *w)
+ev_prepare_start (EV_P_ ev_prepare *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)))
     return;
 
   if (expect_false (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 (ANSIG, signals, signalmax, w->signum, signals_init);
-  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
-
-  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
-    }
+  ev_start (EV_A_ (W)w, ++preparecnt);
+  array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
+  prepares [preparecnt - 1] = w;

 }
 
 void
 }
 
 void

-ev_signal_stop (EV_P_ ev_signal *w)
+ev_prepare_stop (EV_P_ ev_prepare *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 

-  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
-  ev_stop (EV_A_ (W)w);
+  {
+    int active = ((W)w)->active;
+    prepares [active - 1] = prepares [--preparecnt];
+    ((W)prepares [active - 1])->active = active;
+  }

 
 

-  if (!signals [w->signum - 1].head)
-    signal (w->signum, SIG_DFL);
+  ev_stop (EV_A_ (W)w);

 }
 
 void
 }
 
 void

-ev_child_start (EV_P_ ev_child *w)
+ev_check_start (EV_P_ ev_check *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;
 
   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);
+  ev_start (EV_A_ (W)w, ++checkcnt);
+  array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
+  checks [checkcnt - 1] = w;

 }
 
 void
 }
 
 void

-ev_child_stop (EV_P_ ev_child *w)
+ev_check_stop (EV_P_ ev_check *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 
 {
   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);
+  {
+    int active = ((W)w)->active;
+    checks [active - 1] = checks [--checkcnt];
+    ((W)checks [active - 1])->active = active;
+  }
+

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


@@ -1755,62 +1847,30 @@ ev_embed_stop (EV_P_ ev_embed *w)
 }
 #endif
 
 }
 #endif
 

-#if EV_STAT_ENABLE
-
-# ifdef _WIN32
-#  define lstat(a,b) stat(a,b)
-# endif
-
+#if EV_FORK_ENABLE

 void
 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)
+ev_fork_start (EV_P_ ev_fork *w)

 {
   if (expect_false (ev_is_active (w)))
     return;
 
 {
   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);
-
-  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);
+  ev_start (EV_A_ (W)w, ++forkcnt);
+  array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
+  forks [forkcnt - 1] = w;

 }
 
 void
 }
 
 void

-ev_stat_stop (EV_P_ ev_stat *w)
+ev_fork_stop (EV_P_ ev_fork *w)

 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
 

-  ev_timer_stop (EV_A_ &w->timer);
+  {
+    int active = ((W)w)->active;
+    forks [active - 1] = forks [--forkcnt];
+    ((W)forks [active - 1])->active = active;
+  }

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