Fix #251 - 100% CPU usage in NativeDriver

Also use better bounds for timer - it must not execute before, but may execute a little later (on my system it were up to 7 ms actually)
amphp · Dec 11, 2018 · 7075ef7 · 7075ef7
1 parent 23b8bd2
commit 7075ef7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/Loop/NativeDriver.php b/lib/Loop/NativeDriver.php
@@ -276,7 +276,7 @@ private function getTimeout()
                 continue;
             }
 
-            $expiration -= getCurrentTime();
+            $expiration -= $this->now();
 
             if ($expiration < 0) {
                 return 0;

diff --git a/test/Loop/DriverTest.php b/test/Loop/DriverTest.php
@@ -1563,8 +1563,8 @@ public function testNow()
             $new = $this->loop->now();
 
             // Allow a few milliseconds of inaccuracy.
-            $this->assertGreaterThanOrEqual($now - 5, $new);
-            $this->assertLessThanOrEqual($now + 5, $new);
+            $this->assertGreaterThanOrEqual($now - 1, $new);
+            $this->assertLessThanOrEqual($now + 10, $new);
 
             // Same time should be returned from later call.
             $this->assertSame($new, $this->loop->now());

diff --git a/test/LoopTest.php b/test/LoopTest.php
@@ -55,8 +55,8 @@ public function testNow()
                 $new = Loop::now();
 
                 // Allow a few milliseconds of inaccuracy.
-                $this->assertGreaterThanOrEqual($now - 5, $new);
-                $this->assertLessThanOrEqual($now + 5, $new);
+                $this->assertGreaterThanOrEqual($now - 1, $new);
+                $this->assertLessThanOrEqual($now + 10, $new);
 
                 // Same time should be returned from later call.
                 $this->assertSame($new, Loop::now());