[EventLoop] Changed StreamSelectLoop to use non-blocking behavior on tick()

Aaron Stephens · Aaron Stephens · commit b56ce2ebcc32 · 2013-06-12T09:34:18.000+01:00
diff --git a/StreamSelectLoop.php b/StreamSelectLoop.php
@@ -122,19 +122,23 @@ protected function sleepOnPendingTimers()
         }
     }
 
-    protected function runStreamSelect()
+    protected function runStreamSelect($block)
     {
         $read = $this->readStreams ?: null;
         $write = $this->writeStreams ?: null;
         $except = null;
 
         if (!$read && !$write) {
-            $this->sleepOnPendingTimers();
+            if ($block) {
+                $this->sleepOnPendingTimers();
+            }
 
             return;
         }
 
-        if (stream_select($read, $write, $except, 0, $this->getNextEventTimeInMicroSeconds()) > 0) {
+        $timeout = $block ? $this->getNextEventTimeInMicroSeconds() : 0;
+
+        if (stream_select($read, $write, $except, 0, $timeout) > 0) {
             if ($read) {
                 foreach ($read as $stream) {
                     $listener = $this->readListeners[(int) $stream];
@@ -155,21 +159,23 @@ protected function runStreamSelect()
         }
     }
 
-    public function tick()
+    protected function loop($block = true)
     {
         $this->timers->tick();
-        $this->runStreamSelect();
+        $this->runStreamSelect($block);
 
         return $this->running;
     }
 
+    public function tick()
+    {
+        return $this->loop(false);
+    }
+
     public function run()
     {
         $this->running = true;
-
-        while ($this->tick()) {
-            // NOOP
-        }
+        while ($this->loop());
     }
 
     public function stop()

Original file line number	Diff line number	Diff line change
`@@ -122,19 +122,23 @@ protected function sleepOnPendingTimers()`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- protected function runStreamSelect()`
	`125`	`+ protected function runStreamSelect($block)`
`126`	`126`	`{`
`127`	`127`	`$read = $this->readStreams ?: null;`
`128`	`128`	`$write = $this->writeStreams ?: null;`
`129`	`129`	`$except = null;`
`130`	`130`
`131`	`131`	`if (!$read && !$write) {`
`132`		`- $this->sleepOnPendingTimers();`
	`132`	`+ if ($block) {`
	`133`	`+ $this->sleepOnPendingTimers();`
	`134`	`+ }`
`133`	`135`
`134`	`136`	`return;`
`135`	`137`	`}`
`136`	`138`
`137`		`- if (stream_select($read, $write, $except, 0, $this->getNextEventTimeInMicroSeconds()) > 0) {`
	`139`	`+ $timeout = $block ? $this->getNextEventTimeInMicroSeconds() : 0;`
	`140`	`+`
	`141`	`+ if (stream_select($read, $write, $except, 0, $timeout) > 0) {`
`138`	`142`	`if ($read) {`
`139`	`143`	`foreach ($read as $stream) {`
`140`	`144`	`$listener = $this->readListeners[(int) $stream];`
`@@ -155,21 +159,23 @@ protected function runStreamSelect()`
`155`	`159`	`}`
`156`	`160`	`}`
`157`	`161`
`158`		`- public function tick()`
	`162`	`+ protected function loop($block = true)`
`159`	`163`	`{`
`160`	`164`	`$this->timers->tick();`
`161`		`- $this->runStreamSelect();`
	`165`	`+ $this->runStreamSelect($block);`
`162`	`166`
`163`	`167`	`return $this->running;`
`164`	`168`	`}`
`165`	`169`
	`170`	`+ public function tick()`
	`171`	`+ {`
	`172`	`+ return $this->loop(false);`
	`173`	`+ }`
	`174`	`+`
`166`	`175`	`public function run()`
`167`	`176`	`{`
`168`	`177`	`$this->running = true;`
`169`		`-`
`170`		`- while ($this->tick()) {`
`171`		`- // NOOP`
`172`		`- }`
	`178`	`+ while ($this->loop());`
`173`	`179`	`}`
`174`	`180`
`175`	`181`	`public function stop()`