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

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs.
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC

 # include <sys/inotify.h>
 #endif
 /**/
+/*
+ * This is used to avoid floating point rounding problems.
+ * It is added to ev_rt_now when scheduling periodics
+ * to ensure progress, time-wise, even when rounding
+ * errors are against us.
+ * This value is good at least till the year 4000
+ * and intervals up to 20 years.
+ * Better solutions welcome.
+ */
+#define TIME_EPSILON  0.0001220703125 /* 1/8192 */
 #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 CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* 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, TODO */
 #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 noinline                   __attribute__ ((noinline))
-#  define inline_speed              static noinline
-# else
-#  define noinline
-#  define inline_speed              static inline
-# endif
 #else
 # define expect(expr,value)         (expr)
-# define inline_speed               static
-# define inline_size                static
 # define noinline
+# if __STDC_VERSION__ < 199901L
+#  define inline
+# endif
 #endif
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
+#define inline_size        static inline
+#if EV_MINIMAL
+# define inline_speed      static noinline
+#else
+# define inline_speed      static inline
+#endif
 #define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
 #define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
 #define EMPTY       /* required for microsofts broken pseudo-c compiler */
     }
   return ncur;
 }
-inline_speed void *
+static noinline void *
 array_realloc (int elem, void *base, int *cur, int cnt)
 {
   *cur = array_nextsize (elem, *cur, cnt);
   return ev_realloc (base, elem * *cur);
 }
 void noinline
 ev_feed_event (EV_P_ void *w, int revents)
 {
   W w_ = (W)w;
+  int pri = ABSPRI (w_);
   if (expect_false (w_->pending))
+    pendings [pri][w_->pending - 1].events |= revents;
+  else
     {
+      w_->pending = ++pendingcnt [pri];
+      array_needsize (ANPENDING, pendings [pri], pendingmax [pri], w_->pending, EMPTY2);
+      pendings [pri][w_->pending - 1].w      = w_;
-      pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
+      pendings [pri][w_->pending - 1].events = revents;
-      return;
     }
-  w_->pending = ++pendingcnt [ABSPRI (w_)];
-  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;
 }
 void inline_size
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   for (signum = signalmax; signum--; )
     if (signals [signum].gotsig)
       ev_feed_signal_event (EV_A_ signum + 1);
 }
-void inline_size
+void inline_speed
 fd_intern (int fd)
 {
 #ifdef _WIN32
   int arg = 1;
   ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
       /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
       /* first reschedule or stop timer */
       if (w->reschedule_cb)
         {
-          ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
+          ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
           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)
         {
-          ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          ((WT)w)->at = w->offset + floor ((ev_rt_now + TIME_EPSILON - w->offset) / 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
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
       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;
+        ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
     }
   /* now rebuild the heap */
   for (i = periodiccnt >> 1; i--; )
     downheap ((WT *)periodics, periodiccnt, i);
             queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
             call_pending (EV_A);
           }
 #endif
-      /* queue check watchers (and execute them) */
+      /* queue prepare watchers (and execute them) */
       if (expect_false (preparecnt))
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
         }
 ev_clear_pending (EV_P_ void *w)
 {
   W w_ = (W)w;
   int pending = w_->pending;
-  if (!pending)
+  if (expect_true (pending))
+    {
+      ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
+      w_->pending = 0;
+      p->w = 0;
+      return p->events;
+    }
+  else
     return 0;
-  w_->pending = 0;
-  ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
-  p->w = 0;
-  return p->events;
 }
 void inline_size
 pri_adjust (EV_P_ W w)
 {
   w->active = 0;
 }
 /*****************************************************************************/
-void
+void noinline
 ev_io_start (EV_P_ ev_io *w)
 {
   int fd = w->fd;
   if (expect_false (ev_is_active (w)))
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
   fd_change (EV_A_ fd);
 }
-void
+void noinline
 ev_io_stop (EV_P_ ev_io *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   ev_stop (EV_A_ (W)w);
   fd_change (EV_A_ w->fd);
 }
-void
+void noinline
 ev_timer_start (EV_P_ ev_timer *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
   upheap ((WT *)timers, timercnt - 1);
   /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
 }
-void
+void noinline
 ev_timer_stop (EV_P_ ev_timer *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   ((WT)w)->at -= mn_now;
   ev_stop (EV_A_ (W)w);
 }
-void
+void noinline
 ev_timer_again (EV_P_ ev_timer *w)
 {
   if (ev_is_active (w))
     {
       if (w->repeat)
       ev_timer_start (EV_A_ w);
     }
 }
 #if EV_PERIODIC_ENABLE
-void
+void noinline
 ev_periodic_start (EV_P_ ev_periodic *w)
 {
   if (expect_false (ev_is_active (w)))
     return;
     ((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 */
-      ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
+      ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
     }
+  else
+    ((WT)w)->at = w->offset;
   ev_start (EV_A_ (W)w, ++periodiccnt);
   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
+void noinline
 ev_periodic_stop (EV_P_ ev_periodic *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
   }
   ev_stop (EV_A_ (W)w);
 }
-void
+void noinline
 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);
 #ifndef SA_RESTART
 # define SA_RESTART 0
 #endif
-void
+void noinline
 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
       sigaction (w->signum, &sa, 0);
 #endif
     }
 }
-void
+void noinline
 ev_signal_stop (EV_P_ ev_signal *w)
 {
   clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs. Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.168 by root, Sat Dec 8 14:12:07 2007 UTC vs.
Revision 1.176 by root, Tue Dec 11 04:31:55 2007 UTC