Merge pull request #94 from jsor-labs/backport-93

jsor · web-flow · commit 47fe726e8de3 · 2017-04-04T11:26:15.000+02:00
StreamSelectLoop: Fix erroneous zero-time sleep (backport to 0.4)
diff --git a/src/StreamSelectLoop.php b/src/StreamSelectLoop.php
@@ -186,7 +186,11 @@ public function run()
                 if ($timeout < 0) {
                     $timeout = 0;
                 } else {
-                    $timeout *= self::MICROSECONDS_PER_SECOND;
+                    /*
+                     * round() needed to correct float error:
+                     * https://github.com/reactphp/event-loop/issues/48
+                     */
+                    $timeout = round($timeout * self::MICROSECONDS_PER_SECOND);
                 }
 
             // The only possible event is stream activity, so wait forever ...
diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -4,6 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use React\EventLoop\StreamSelectLoop;
+use React\EventLoop\Timer\Timer;
 
 class StreamSelectLoopTest extends AbstractLoopTest
 {
@@ -145,4 +146,34 @@ protected function forkSendSignal($signal)
             die();
         }
     }
+
+    /**
+     * https://github.com/reactphp/event-loop/issues/48
+     *
+     * Tests that timer with very small interval uses at least 1 microsecond
+     * timeout.
+     */
+    public function testSmallTimerInterval()
+    {
+        /** @var StreamSelectLoop|\PHPUnit_Framework_MockObject_MockObject $loop */
+        $loop = $this->getMock('React\EventLoop\StreamSelectLoop', ['streamSelect']);
+        $loop
+            ->expects($this->at(0))
+            ->method('streamSelect')
+            ->with([], [], 1);
+        $loop
+            ->expects($this->at(1))
+            ->method('streamSelect')
+            ->with([], [], 0);
+
+        $callsCount = 0;
+        $loop->addPeriodicTimer(Timer::MIN_INTERVAL, function() use (&$loop, &$callsCount) {
+            $callsCount++;
+            if ($callsCount == 2) {
+                $loop->stop();
+            }
+        });
+
+        $loop->run();
+    }
 }
