From 7e7a7e7d2d8de852b9782938dd114dfeb060b1db Mon Sep 17 00:00:00 2001
From: root <root>
Date: Tue, 30 Oct 2007 21:42:13 +0000
Subject: *** empty log message ***

---
 ev.c | 16 ++--------------
 ev.h |  3 ++-
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/ev.c b/ev.c
index c4935e9..3105078 100644
--- a/ev.c
+++ b/ev.c
@@ -258,25 +258,18 @@ timer_reify (void)
     {
       struct ev_timer *w = timers [0];
 
-          fprintf (stderr, "0 %f, %d c%d\n", w->at, w->active, timercnt);//D
       /* first reschedule timer */
       if (w->repeat)
         {
-          fprintf (stderr, "a %f now %f repeat %f, %f\n", w->at, ev_now, w->repeat, w->repeat *1e30);//D
           if (w->is_abs)
             w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
           else
             w->at = ev_now + w->repeat;
 
-          fprintf (stderr, "b %f\n", w->at);//D
-
           downheap (0);
         }
       else
-        {
-          fprintf (stderr, "c %f, %d c%d\n", w->at, w->active, timercnt);//D
         evtimer_stop (w); /* nonrepeating: stop timer */
-        }
 
       event ((struct ev_watcher *)w, EV_TIMEOUT);
     }
@@ -308,7 +301,6 @@ int ev_loop (int flags)
           else if (block > MAX_BLOCKTIME) block = MAX_BLOCKTIME;
         }
 
-      fprintf (stderr, "block %f\n", block);//D
       method_poll (block);
 
       /* put pending timers into pendign queue and reschedule them */
@@ -396,7 +388,6 @@ evtimer_start (struct ev_timer *w)
   if (ev_is_active (w))
     return;
 
-  fprintf (stderr, "t1 %f a %d\n", w->at, w->is_abs);//D
   if (w->is_abs)
     {
       /* this formula differs from the one in timer_reify becuse we do not round up */
@@ -405,7 +396,6 @@ evtimer_start (struct ev_timer *w)
     }
   else
     w->at += ev_now;
-  fprintf (stderr, "t2 %f a %d\n", w->at, w->is_abs);//D
 
   ev_start ((struct ev_watcher *)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );
@@ -416,14 +406,12 @@ evtimer_start (struct ev_timer *w)
 void
 evtimer_stop (struct ev_timer *w)
 {
-  fprintf (stderr, "-topping %d, %d\n", w->active, timercnt);//D
   if (!ev_is_active (w))
     return;
 
-  fprintf (stderr, "stopping %d, %d\n", w->active, timercnt);//D
-  if (w->active < timercnt)
+  if (w->active < timercnt--)
     {
-      timers [w->active - 1] = timers [--timercnt];
+      timers [w->active - 1] = timers [timercnt];
       downheap (w->active - 1);
     }
 
diff --git a/ev.h b/ev.h
index 300573b..865338f 100644
--- a/ev.h
+++ b/ev.h
@@ -64,13 +64,14 @@ ev_tstamp ev_time (void);
 int ev_loop (int flags);
 extern int ev_loop_done; /* set to 1 to break out of event loop */
 
+/* these may evaluate ev multiple times, and the other arguments at most once */
 #define evw_init(ev,cb_,data_)             do { (ev)->active = 0; (ev)->cb = (cb_); (ev)->data = (void *)data_; } while (0)
 #define evio_set(ev,fd_,events_)           do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
 #define evtimer_set_rel(ev,after_,repeat_) do { (ev)->at = (after_); (ev)->repeat = (repeat_); (ev)->is_abs = 0; } while (0)
 #define evtimer_set_abs(ev,at_,repeat_)    do { (ev)->at = (at_); (ev)->repeat = (repeat_); (ev)->is_abs = 1; } while (0)
 #define evsignal_set(ev,signum_)           do { (ev)->signum = (signum_); } while (0)
 
-#define ev_is_active(ev) (0 + (ev)->active) /* wether the watcher has been started */
+#define ev_is_active(ev) (0 + (ev)->active) /* true when the watcher has been started */
 
 void evio_start (struct ev_io *w);
 void evio_stop  (struct ev_io *w);
-- 
cgit v1.2.3