[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.158 by root, Thu Nov 29 17:28:13 2007 UTC

       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;
+  call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
   while (activecnt)
     {
+#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)
           {

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