*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 14046a2b3b1206a3460f824d14fd7c67880e5373..76dc021a3eee608ce9d2488fc929e021b3e10ff1 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -28,6 +28,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */

+
+#ifdef __cplusplus
+extern "C" {
+#endif
+

 #ifndef EV_STANDALONE
 # include "config.h"
 
 #ifndef EV_STANDALONE
 # include "config.h"
 


@@ -48,7 +53,7 @@
 #  define EV_USE_EPOLL 1
 # endif
 
 #  define EV_USE_EPOLL 1
 # endif
 

-# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H

 #  define EV_USE_KQUEUE 1
 # endif
 
 #  define EV_USE_KQUEUE 1
 # endif
 


@@ -223,6 +228,7 @@ typedef struct
 
   struct ev_loop
   {
 
   struct ev_loop
   {

+    ev_tstamp ev_rt_now;

     #define VAR(name,decl) decl;
       #include "ev_vars.h"
     #undef VAR
     #define VAR(name,decl) decl;
       #include "ev_vars.h"
     #undef VAR


@@ -234,6 +240,7 @@ typedef struct
 
 #else
 
 
 #else
 

+  ev_tstamp ev_rt_now;

   #define VAR(name,decl) static decl;
     #include "ev_vars.h"
   #undef VAR
   #define VAR(name,decl) static decl;
     #include "ev_vars.h"
   #undef VAR


@@ -273,11 +280,13 @@ get_clock (void)
   return ev_time ();
 }
 
   return ev_time ();
 }
 

+#if EV_MULTIPLICITY

 ev_tstamp
 ev_now (EV_P)
 {
 ev_tstamp
 ev_now (EV_P)
 {

-  return rt_now;
+  return ev_rt_now;

 }
 }

+#endif

 
 #define array_roundsize(type,n) ((n) | 4 & ~3)
 
 
 #define array_roundsize(type,n) ((n) | 4 & ~3)
 


@@ -737,10 +746,10 @@ loop_init (EV_P_ int methods)
       }
 #endif
 
       }
 #endif
 

-      rt_now    = ev_time ();
+      ev_rt_now = ev_time ();

       mn_now    = get_clock ();
       now_floor = mn_now;
       mn_now    = get_clock ();
       now_floor = mn_now;

-      rtmn_diff = rt_now - mn_now;
+      rtmn_diff = ev_rt_now - mn_now;

 
       if (methods == EVMETHOD_AUTO)
         if (!enable_secure () && getenv ("LIBEV_METHODS"))
 
       if (methods == EVMETHOD_AUTO)
         if (!enable_secure () && getenv ("LIBEV_METHODS"))


@@ -993,7 +1002,7 @@ timers_reify (EV_P)
 static void
 periodics_reify (EV_P)
 {
 static void
 periodics_reify (EV_P)
 {

-  while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
+  while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)

     {
       struct ev_periodic *w = periodics [0];
 
     {
       struct ev_periodic *w = periodics [0];
 


@@ -1002,15 +1011,15 @@ periodics_reify (EV_P)
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
         {
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
         {

-          ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
+          ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);

 
 

-          assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
+          assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else if (w->interval)
         {
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else if (w->interval)
         {

-          ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
-          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
+          ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else


@@ -1031,9 +1040,9 @@ periodics_reschedule (EV_P)
       struct ev_periodic *w = periodics [i];
 
       if (w->reschedule_cb)
       struct ev_periodic *w = periodics [i];
 
       if (w->reschedule_cb)

-        ((WT)w)->at = w->reschedule_cb (w, rt_now);
+        ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);

       else if (w->interval)
       else if (w->interval)

-        ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
+        ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;

     }
 
   /* now rebuild the heap */
     }
 
   /* now rebuild the heap */


@@ -1048,13 +1057,13 @@ time_update_monotonic (EV_P)
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {
 
   if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
     {

-      rt_now = rtmn_diff + mn_now;
+      ev_rt_now = rtmn_diff + mn_now;

       return 0;
     }
   else
     {
       now_floor = mn_now;
       return 0;
     }
   else
     {
       now_floor = mn_now;

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

       return 1;
     }
 }
       return 1;
     }
 }


@@ -1073,12 +1082,12 @@ time_update (EV_P)
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {
 
           for (i = 4; --i; ) /* loop a few times, before making important decisions */
             {

-              rtmn_diff = rt_now - mn_now;
+              rtmn_diff = ev_rt_now - mn_now;

 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 
 
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 

-              rt_now    = ev_time ();
+              ev_rt_now = ev_time ();

               mn_now    = get_clock ();
               now_floor = mn_now;
             }
               mn_now    = get_clock ();
               now_floor = mn_now;
             }


@@ -1091,18 +1100,18 @@ time_update (EV_P)
   else
 #endif
     {
   else
 #endif
     {

-      rt_now = ev_time ();
+      ev_rt_now = ev_time ();

 
 

-      if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
+      if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))

         {
           periodics_reschedule (EV_A);
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
         {
           periodics_reschedule (EV_A);
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)

-            ((WT)timers [i])->at += rt_now - mn_now;
+            ((WT)timers [i])->at += ev_rt_now - mn_now;

         }
 
         }
 

-      mn_now = rt_now;
+      mn_now = ev_rt_now;

     }
 }
 
     }
 }
 


@@ -1152,8 +1161,8 @@ ev_loop (EV_P_ int flags)
       else
 #endif
         {
       else
 #endif
         {

-          rt_now = ev_time ();
-          mn_now = rt_now;
+          ev_rt_now = ev_time ();
+          mn_now    = ev_rt_now;

         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         }
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)


@@ -1170,7 +1179,7 @@ ev_loop (EV_P_ int flags)
 
           if (periodiccnt)
             {
 
           if (periodiccnt)
             {

-              ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
+              ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;

               if (block > to) block = to;
             }
 
               if (block > to) block = to;
             }
 


@@ -1179,7 +1188,7 @@ ev_loop (EV_P_ int flags)
 
       method_poll (EV_A_ block);
 
 
       method_poll (EV_A_ block);
 

-      /* update rt_now, do magic */
+      /* update ev_rt_now, do magic */

       time_update (EV_A);
 
       /* queue pending timers and reschedule them */
       time_update (EV_A);
 
       /* queue pending timers and reschedule them */


@@ -1350,12 +1359,12 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
     return;
 
   if (w->reschedule_cb)
     return;
 
   if (w->reschedule_cb)

-    ((WT)w)->at = w->reschedule_cb (w, rt_now);
+    ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);

   else if (w->interval)
     {
       assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
       /* this formula differs from the one in periodic_reify because we do not always round up */
   else if (w->interval)
     {
       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 */

-      ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
+      ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;

     }
 
   ev_start (EV_A_ (W)w, ++periodiccnt);
     }
 
   ev_start (EV_A_ (W)w, ++periodiccnt);


@@ -1592,3 +1601,7 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
     }
 }
 
     }
 }
 

+#ifdef __cplusplus
+}
+#endif
+