rmeove remaining debugging code

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index a038613087c6da2e2839771cce12ded5df737832..aefc9dfc3da7c5b9453f9168721dfff56ccffafc 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -85,7 +85,6 @@ get_clock (void)
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \

-      fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\

       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \
       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \


@@ -540,7 +539,7 @@ void ev_loop (int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

-              ev_tstamp to = timers [0]->at - get_clock () + method_fudge;
+              ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;

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


@@ -679,9 +678,28 @@ evtimer_stop (struct ev_timer *w)
       downheap ((WT *)timers, timercnt, w->active - 1);
     }
 
       downheap ((WT *)timers, timercnt, w->active - 1);
     }
 

+  w->at = w->repeat;
+

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

+void
+evtimer_again (struct ev_timer *w)
+{
+  if (ev_is_active (w))
+    {
+      if (w->repeat)
+        {
+          w->at = now + w->repeat;
+          downheap ((WT *)timers, timercnt, w->active - 1);
+        }
+      else
+        evtimer_stop (w);
+    }
+  else if (w->repeat)
+    evtimer_start (w);
+}
+

 void
 evperiodic_start (struct ev_periodic *w)
 {
 void
 evperiodic_start (struct ev_periodic *w)
 {