Merge pull request #51 from andrewminerd/timer_fix

clue · web-flow · commit e515aaa2af0e · 2017-01-10T09:07:50.000+01:00
StreamSelectLoop: Use fresh time so Timers added during stream events are accurate
diff --git a/src/Timer/Timers.php b/src/Timer/Timers.php
@@ -30,7 +30,7 @@ public function getTime()
     public function add(TimerInterface $timer)
     {
         $interval = $timer->getInterval();
-        $scheduledAt = $interval + $this->getTime();
+        $scheduledAt = $interval + microtime(true);
 
         $this->timers->attach($timer, $scheduledAt);
         $this->scheduler->insert($timer, -$scheduledAt);
diff --git a/tests/Timer/TimersTest.php b/tests/Timer/TimersTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace React\Tests\EventLoop\Timer;
+
+use React\Tests\EventLoop\TestCase;
+use React\EventLoop\Timer\Timer;
+use React\EventLoop\Timer\Timers;
+
+class TimersTest extends TestCase
+{
+    public function testBlockedTimer()
+    {
+        $loop = $this
+            ->getMockBuilder('React\EventLoop\LoopInterface')
+            ->getMock();
+        
+        $timers = new Timers();
+        $timers->tick();
+        
+        // simulate a bunch of processing on stream events,
+        // part of which schedules a future timer...
+        sleep(1);
+        $timers->add(new Timer($loop, 0.5, function () {
+            $this->fail("Timer shouldn't be called");
+        }));
+
+        $timers->tick();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function getTime()`
`30`	`30`	`public function add(TimerInterface $timer)`
`31`	`31`	`{`
`32`	`32`	`$interval = $timer->getInterval();`
`33`		`- $scheduledAt = $interval + $this->getTime();`
	`33`	`+ $scheduledAt = $interval + microtime(true);`
`34`	`34`
`35`	`35`	`$this->timers->attach($timer, $scheduledAt);`
`36`	`36`	`$this->scheduler->insert($timer, -$scheduledAt);`