*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index e10b36071f8c4ec4a6f3be6d17aab45ca1674ca2..3903a6cd42ceb14b5fa0626ee4718a50192a82f4 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -61,6 +61,10 @@ extern "C" {
 #  define EV_USE_KQUEUE 1
 # endif
 
 #  define EV_USE_KQUEUE 1
 # endif
 

+# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
+#  define EV_USE_PORT 1
+# endif
+

 #endif
 
 #include <math.h>
 #endif
 
 #include <math.h>


@@ -92,12 +96,15 @@ extern "C" {
 /**/
 
 #ifndef EV_USE_MONOTONIC
 /**/
 
 #ifndef EV_USE_MONOTONIC

-# define EV_USE_MONOTONIC 1
+# define EV_USE_MONOTONIC 0
+#endif
+
+#ifndef EV_USE_REALTIME
+# define EV_USE_REALTIME 0

 #endif
 
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1
 #endif
 
 #ifndef EV_USE_SELECT
 # define EV_USE_SELECT 1

-# define EV_SELECT_USE_FD_SET 1

 #endif
 
 #ifndef EV_USE_POLL
 #endif
 
 #ifndef EV_USE_POLL


@@ -116,8 +123,8 @@ extern "C" {
 # define EV_USE_KQUEUE 0
 #endif
 
 # define EV_USE_KQUEUE 0
 #endif
 

-#ifndef EV_USE_REALTIME
-# define EV_USE_REALTIME 1
+#ifndef EV_USE_PORT
+# define EV_USE_PORT 0

 #endif
 
 /**/
 #endif
 
 /**/


@@ -145,9 +152,9 @@ extern "C" {
 /**/
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 /**/
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */

-#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
+#define 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 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 */
+/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */

 
 #ifdef EV_H
 # include EV_H
 
 #ifdef EV_H
 # include EV_H


@@ -157,7 +164,7 @@ extern "C" {
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 
 #if __GNUC__ >= 3
 # define expect(expr,value)         __builtin_expect ((expr),(value))

-# define inline                     inline
+# define inline                     static inline

 #else
 # define expect(expr,value)         (expr)
 # define inline                     static
 #else
 # define expect(expr,value)         (expr)
 # define inline                     static


@@ -361,7 +368,7 @@ ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
 
 {
   W w_ = (W)w;
 

-  if (w_->pending)
+  if (expect_false (w_->pending))

     {
       pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;
     {
       pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
       return;


@@ -405,7 +412,7 @@ ev_feed_fd_event (EV_P_ int fd, int revents)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static void
+inline void

 fd_reify (EV_P)
 {
   int i;
 fd_reify (EV_P)
 {
   int i;


@@ -442,7 +449,7 @@ fd_reify (EV_P)
 static void
 fd_change (EV_P_ int fd)
 {
 static void
 fd_change (EV_P_ int fd)
 {

-  if (anfds [fd].reify)
+  if (expect_false (anfds [fd].reify))

     return;
 
   anfds [fd].reify = 1;
     return;
 
   anfds [fd].reify = 1;


@@ -464,7 +471,7 @@ fd_kill (EV_P_ int fd)
     }
 }
 
     }
 }
 

-static int
+inline int

 fd_valid (int fd)
 {
 #ifdef _WIN32
 fd_valid (int fd)
 {
 #ifdef _WIN32


@@ -643,7 +650,7 @@ sigcb (EV_P_ struct ev_io *iow, int revents)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 
       ev_feed_signal_event (EV_A_ signum + 1);
 }
 

-inline void
+static void

 fd_intern (int fd)
 {
 #ifdef _WIN32
 fd_intern (int fd)
 {
 #ifdef _WIN32


@@ -712,6 +719,9 @@ childcb (EV_P_ struct ev_signal *sw, int revents)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

+#if EV_USE_PORT
+# include "ev_port.c"
+#endif

 #if EV_USE_KQUEUE
 # include "ev_kqueue.c"
 #endif
 #if EV_USE_KQUEUE
 # include "ev_kqueue.c"
 #endif


@@ -780,6 +790,9 @@ loop_init (EV_P_ unsigned int flags)
         flags |= 0x0000ffff;
 
       method = 0;
         flags |= 0x0000ffff;
 
       method = 0;

+#if EV_USE_PORT
+      if (!method && (flags & EVMETHOD_PORT  )) method = port_init   (EV_A_ flags);
+#endif

 #if EV_USE_KQUEUE
       if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
 #endif
 #if EV_USE_KQUEUE
       if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
 #endif


@@ -798,11 +811,14 @@ loop_init (EV_P_ unsigned int flags)
     }
 }
 
     }
 }
 

-void
+static void

 loop_destroy (EV_P)
 {
   int i;
 
 loop_destroy (EV_P)
 {
   int i;
 

+#if EV_USE_PORT
+  if (method == EVMETHOD_PORT  ) port_destroy   (EV_A);
+#endif

 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif


@@ -835,12 +851,15 @@ loop_destroy (EV_P)
 static void
 loop_fork (EV_P)
 {
 static void
 loop_fork (EV_P)
 {

-#if EV_USE_EPOLL
-  if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
+#if EV_USE_PORT
+  if (method == EVMETHOD_PORT  ) port_fork   (EV_A);

 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
 #endif
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
 #endif

+#if EV_USE_EPOLL
+  if (method == EVMETHOD_EPOLL ) epoll_fork  (EV_A);
+#endif

 
   if (ev_is_active (&sigev))
     {
 
   if (ev_is_active (&sigev))
     {


@@ -893,7 +912,7 @@ ev_loop_fork (EV_P)
 
 #if EV_MULTIPLICITY
 struct ev_loop *
 
 #if EV_MULTIPLICITY
 struct ev_loop *

-ev_default_loop_ (unsigned int flags)
+ev_default_loop_init (unsigned int flags)

 #else
 int
 ev_default_loop (unsigned int flags)
 #else
 int
 ev_default_loop (unsigned int flags)


@@ -908,7 +927,7 @@ ev_default_loop (unsigned int flags)
 #if EV_MULTIPLICITY
       struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
 #else
 #if EV_MULTIPLICITY
       struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
 #else

-      ev_default_default_loop_ptr = 1;
+      ev_default_loop_ptr = 1;

 #endif
 
       loop_init (EV_A_ flags);
 #endif
 
       loop_init (EV_A_ flags);


@@ -977,7 +996,7 @@ any_pending (EV_P)
   return 0;
 }
 
   return 0;
 }
 

-static void
+inline void

 call_pending (EV_P)
 {
   int pri;
 call_pending (EV_P)
 {
   int pri;


@@ -987,7 +1006,7 @@ call_pending (EV_P)
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
 
       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
 

-        if (p->w)
+        if (expect_true (p->w))

           {
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);
           {
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);


@@ -995,7 +1014,7 @@ call_pending (EV_P)
       }
 }
 
       }
 }
 

-static void
+inline void

 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
 timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)


@@ -1023,7 +1042,7 @@ timers_reify (EV_P)
 }
 
 #if EV_PERIODICS
 }
 
 #if EV_PERIODICS

-static void
+inline void

 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
 periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)


@@ -1092,7 +1111,7 @@ time_update_monotonic (EV_P)
     }
 }
 
     }
 }
 

-static void
+inline void

 time_update (EV_P)
 {
   int i;
 time_update (EV_P)
 {
   int i;


@@ -1213,7 +1232,7 @@ ev_loop (EV_P_ int flags)
             }
 #endif
 
             }
 #endif
 

-          if (block < 0.) block = 0.;
+          if (expect_false (block < 0.)) block = 0.;

         }
 
       method_poll (EV_A_ block);
         }
 
       method_poll (EV_A_ block);


@@ -1232,12 +1251,12 @@ ev_loop (EV_P_ int flags)
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */
         queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
 
       /* queue check watchers, to be executed first */

-      if (checkcnt)
+      if (expect_false (checkcnt))

         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
 
       call_pending (EV_A);
 
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
 
       call_pending (EV_A);
 

-      if (loop_done)
+      if (expect_false (loop_done))

         break;
     }
 
         break;
     }
 


@@ -1309,7 +1328,7 @@ ev_io_start (EV_P_ struct ev_io *w)
 {
   int fd = w->fd;
 
 {
   int fd = w->fd;
 

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   assert (("ev_io_start called with negative fd", fd >= 0));
     return;
 
   assert (("ev_io_start called with negative fd", fd >= 0));


@@ -1325,7 +1344,7 @@ void
 ev_io_stop (EV_P_ struct ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_io_stop (EV_P_ struct ev_io *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
     return;
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));


@@ -1339,7 +1358,7 @@ ev_io_stop (EV_P_ struct ev_io *w)
 void
 ev_timer_start (EV_P_ struct ev_timer *w)
 {
 void
 ev_timer_start (EV_P_ struct ev_timer *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ((WT)w)->at += mn_now;
     return;
 
   ((WT)w)->at += mn_now;


@@ -1358,12 +1377,12 @@ void
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_timer_stop (EV_P_ struct ev_timer *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
 
     return;
 
   assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
 

-  if (((W)w)->active < timercnt--)
+  if (expect_true (((W)w)->active < timercnt--))

     {
       timers [((W)w)->active - 1] = timers [timercnt];
       adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
     {
       timers [((W)w)->active - 1] = timers [timercnt];
       adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);


@@ -1398,7 +1417,7 @@ ev_timer_again (EV_P_ struct ev_timer *w)
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {
 void
 ev_periodic_start (EV_P_ struct ev_periodic *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   if (w->reschedule_cb)
     return;
 
   if (w->reschedule_cb)


@@ -1422,12 +1441,12 @@ void
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_periodic_stop (EV_P_ struct ev_periodic *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
 
     return;
 
   assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
 

-  if (((W)w)->active < periodiccnt--)
+  if (expect_true (((W)w)->active < periodiccnt--))

     {
       periodics [((W)w)->active - 1] = periodics [periodiccnt];
       adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
     {
       periodics [((W)w)->active - 1] = periodics [periodiccnt];
       adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);


@@ -1448,7 +1467,7 @@ ev_periodic_again (EV_P_ struct ev_periodic *w)
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {
 void
 ev_idle_start (EV_P_ struct ev_idle *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++idlecnt);


@@ -1460,7 +1479,7 @@ void
 ev_idle_stop (EV_P_ struct ev_idle *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_idle_stop (EV_P_ struct ev_idle *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   idles [((W)w)->active - 1] = idles [--idlecnt];
     return;
 
   idles [((W)w)->active - 1] = idles [--idlecnt];


@@ -1470,7 +1489,7 @@ ev_idle_stop (EV_P_ struct ev_idle *w)
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {
 void
 ev_prepare_start (EV_P_ struct ev_prepare *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);
     return;
 
   ev_start (EV_A_ (W)w, ++preparecnt);


@@ -1482,7 +1501,7 @@ void
 ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_prepare_stop (EV_P_ struct ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   prepares [((W)w)->active - 1] = prepares [--preparecnt];
     return;
 
   prepares [((W)w)->active - 1] = prepares [--preparecnt];


@@ -1492,7 +1511,7 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w)
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {
 void
 ev_check_start (EV_P_ struct ev_check *w)
 {

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);
     return;
 
   ev_start (EV_A_ (W)w, ++checkcnt);


@@ -1504,7 +1523,7 @@ void
 ev_check_stop (EV_P_ struct ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_check_stop (EV_P_ struct ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   checks [((W)w)->active - 1] = checks [--checkcnt];
     return;
 
   checks [((W)w)->active - 1] = checks [--checkcnt];


@@ -1521,7 +1540,7 @@ ev_signal_start (EV_P_ struct ev_signal *w)
 #if EV_MULTIPLICITY
   assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
 #if EV_MULTIPLICITY
   assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
     return;
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));


@@ -1548,7 +1567,7 @@ void
 ev_signal_stop (EV_P_ struct ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_signal_stop (EV_P_ struct ev_signal *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
     return;
 
   wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);


@@ -1564,7 +1583,7 @@ ev_child_start (EV_P_ struct ev_child *w)
 #if EV_MULTIPLICITY
   assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif
 #if EV_MULTIPLICITY
   assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
 #endif

-  if (ev_is_active (w))
+  if (expect_false (ev_is_active (w)))

     return;
 
   ev_start (EV_A_ (W)w, 1);
     return;
 
   ev_start (EV_A_ (W)w, 1);


@@ -1575,7 +1594,7 @@ void
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);
 ev_child_stop (EV_P_ struct ev_child *w)
 {
   ev_clear_pending (EV_A_ (W)w);

-  if (!ev_is_active (w))
+  if (expect_false (!ev_is_active (w)))

     return;
 
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
     return;
 
   wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);


@@ -1622,26 +1641,27 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
 {
   struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
 
 {
   struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
 

-  if (!once)
-    cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
-  else
+  if (expect_false (!once))

     {
     {

-      once->cb  = cb;
-      once->arg = arg;
+      cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+      return;
+    }

 
 

-      ev_init (&once->io, once_cb_io);
-      if (fd >= 0)
-        {
-          ev_io_set (&once->io, fd, events);
-          ev_io_start (EV_A_ &once->io);
-        }
+  once->cb  = cb;
+  once->arg = arg;

 
 

-      ev_init (&once->to, once_cb_to);
-      if (timeout >= 0.)
-        {
-          ev_timer_set (&once->to, timeout, 0.);
-          ev_timer_start (EV_A_ &once->to);
-        }
+  ev_init (&once->io, once_cb_io);
+  if (fd >= 0)
+    {
+      ev_io_set (&once->io, fd, events);
+      ev_io_start (EV_A_ &once->io);
+    }
+
+  ev_init (&once->to, once_cb_to);
+  if (timeout >= 0.)
+    {
+      ev_timer_set (&once->to, timeout, 0.);
+      ev_timer_start (EV_A_ &once->to);

     }
 }
 
     }
 }