*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 35180023c603d60532c1f2008223a822a8ecdc47..221da5941112d05de049c26c62740004e32c158a 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1344,7 +1344,7 @@ ev_loop (EV_P_ int flags)
 
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
 
 
   call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
 

-  while (activecnt)
+  while (expect_false (!activecnt))

     {
 #ifndef _WIN32
       if (expect_false (curpid)) /* penalise the forking check even more */
     {
 #ifndef _WIN32
       if (expect_false (curpid)) /* penalise the forking check even more */


@@ -1372,6 +1372,9 @@ ev_loop (EV_P_ int flags)
           call_pending (EV_A);
         }
 
           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);
       /* we might have forked, so reify kernel state if necessary */
       if (expect_false (postfork))
         loop_fork (EV_A);


@@ -1383,7 +1386,7 @@ ev_loop (EV_P_ int flags)
       {
         ev_tstamp block;
 
       {
         ev_tstamp block;
 

-        if (flags & EVLOOP_NONBLOCK || idlecnt)
+        if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))

           block = 0.; /* do not block at all */
         else
           {
           block = 0.; /* do not block at all */
         else
           {