Fix bug causing infinite busy wait with active immediates

amphp · Aug 20, 2015 · 8f884b0 · 8f884b0
1 parent e882ecc
commit 8f884b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -7,6 +7,8 @@
 - Fix issue in NativeReactor capable of causing keep alive
   counter corruption when a watcher was cancelled inside its
   own callback.
+- Fix issue in UvReactor with libuv >= 1.1.0 causing busy loop
+  with immediates present, but no watchers being triggered.
 
 ### 1.0.2
 

diff --git a/lib/UvReactor.php b/lib/UvReactor.php
@@ -90,8 +90,7 @@ public function run(callable $onStart = null) {
             if (empty($this->keepAliveCount) || $this->state <= self::STOPPED) {
                 break;
             }
-            $flags = \UV::RUN_ONCE | ($this->immediates ? \UV::RUN_NOWAIT : 0);
-            \uv_run($this->loop, $flags);
+            \uv_run($this->loop, $this->immediates ? \UV::RUN_NOWAIT : \UV::RUN_ONCE);
         }
 
         \gc_collect_cycles();
@@ -150,8 +149,7 @@ public function tick($noWait = false) {
 
         // Check the conditional again because a manual stop() could've changed the state
         if ($this->state > 0) {
-            $flags = ($noWait || $this->immediates) ? (\UV::RUN_DEFAULT | \UV::RUN_NOWAIT) : \UV::RUN_ONCE;
-            \uv_run($this->loop, $flags);
+            \uv_run($this->loop, $noWait || $this->immediates ? \UV::RUN_NOWAIT : \UV::RUN_ONCE);
         }
 
         $this->state = self::STOPPED;