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

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC

       tv.tv_sec  = (time_t)delay;
       tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
       /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
-      /* somehting nto guaranteed by newer posix versions, but guaranteed */
+      /* somehting not guaranteed by newer posix versions, but guaranteed */
       /* by older ones */
       select (0, 0, 0, 0, &tv);
 #endif
     }
 }
 ev_loop_count (EV_P)
 {
   return loop_count;
 }
+unsigned int
+ev_loop_depth (EV_P)
+{
+  return loop_depth;
+}
 void
 ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
 {
   io_blocktime = interval;
 }
       mn_now = ev_rt_now;
     }
 }
-static int loop_done;
 void
 ev_loop (EV_P_ int flags)
 {
+  ++loop_depth;
   loop_done = EVUNLOOP_CANCEL;
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
   do
         ev_tstamp waittime  = 0.;
         ev_tstamp sleeptime = 0.;
         if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
           {
+            /* remember old timestamp for io_blocktime calculation */
+            ev_tstamp prev_mn_now = mn_now;
             /* update time to cancel out callback processing overhead */
             time_update (EV_A_ 1e100);
             waittime = MAX_BLOCKTIME;
                 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge;
                 if (waittime > to) waittime = to;
               }
 #endif
+            /* don't let timeouts decrease the waittime below timeout_blocktime */
             if (expect_false (waittime < timeout_blocktime))
               waittime = timeout_blocktime;
-            sleeptime = waittime - backend_fudge;
+            /* extra check because io_blocktime is commonly 0 */
-            if (expect_true (sleeptime > io_blocktime))
+            if (expect_false (io_blocktime))
-              sleeptime = io_blocktime;
-            if (sleeptime)
               {
+                sleeptime = io_blocktime - (mn_now - prev_mn_now);
+                if (sleeptime > waittime - backend_fudge)
+                  sleeptime = waittime - backend_fudge;
+                if (expect_true (sleeptime > 0.))
+                  {
-                ev_sleep (sleeptime);
+                    ev_sleep (sleeptime);
-                waittime -= sleeptime;
+                    waittime -= sleeptime;
+                  }
               }
           }
         ++loop_count;
         backend_poll (EV_A_ waittime);
     && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
   ));
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;
+  --loop_depth;
 }
 void
 ev_unloop (EV_P_ int how)
 {

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs. Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.292 by root, Mon Jun 29 07:22:56 2009 UTC vs.
Revision 1.294 by root, Wed Jul 8 02:46:05 2009 UTC