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

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC vs.
Revision 1.162 by root, Mon Dec 3 13:41:24 2007 UTC

 ev_backend (EV_P)
 {
   return backend;
 }
+unsigned int
+ev_loop_count (EV_P)
+{
+  return loop_count;
+}
 static void noinline
 loop_init (EV_P_ unsigned int flags)
 {
   if (!backend)
     {
       ev_rt_now = ev_time ();
       mn_now    = get_clock ();
       now_floor = mn_now;
       rtmn_diff = ev_rt_now - mn_now;
+      /* pid check not overridable via env */
+#ifndef _WIN32
+      if (flags & EVFLAG_FORKCHECK)
+        curpid = getpid ();
+#endif
       if (!(flags & EVFLAG_NOENV)
           && !enable_secure ()
           && getenv ("LIBEV_FLAGS"))
         flags = atoi (getenv ("LIBEV_FLAGS"));
 {
   loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
             ? EVUNLOOP_ONE
             : EVUNLOOP_CANCEL;
-  while (activecnt)
+  call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
+  do
     {
+#ifndef _WIN32
+      if (expect_false (curpid)) /* penalise the forking check even more */
+        if (expect_false (getpid () != curpid))
+          {
+            curpid = getpid ();
+            postfork = 1;
+          }
+#endif
 #if EV_FORK_ENABLE
       /* we might have forked, so queue fork handlers */
       if (expect_false (postfork))
         if (forkcnt)
           {
         {
           queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
           call_pending (EV_A);
         }
+      if (expect_false (!activecnt))
+        break;
       /* we might have forked, so reify kernel state if necessary */
       if (expect_false (postfork))
         loop_fork (EV_A);
       /* update fd-related kernel structures */
       /* calculate blocking time */
       {
         ev_tstamp block;
-        if (flags & EVLOOP_NONBLOCK || idlecnt)
+        if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
           block = 0.; /* do not block at all */
         else
           {
             /* update time to cancel out callback processing overhead */
 #if EV_USE_MONOTONIC
 #endif
             if (expect_false (block < 0.)) block = 0.;
           }
+        ++loop_count;
         backend_poll (EV_A_ block);
       }
       /* update ev_rt_now, do magic */
       time_update (EV_A);
       if (expect_false (checkcnt))
         queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
       call_pending (EV_A);
-      if (expect_false (loop_done))
-        break;
     }
+  while (expect_true (activecnt && !loop_done));
   if (loop_done == EVUNLOOP_ONE)
     loop_done = EVUNLOOP_CANCEL;
 }

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC vs. Revision 1.162 by root, Mon Dec 3 13:41:24 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC vs.
Revision 1.162 by root, Mon Dec 3 13:41:24 2007 UTC