danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2025-01-22 05:11:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix NativeReactor bug breaking tick sleep timing

Browse Source
This commit is contained in:
Daniel Lowrey 2015-05-19 16:13:53 -04:00
parent 44d52cdf2f
commit ca82ac5362
3 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
functor when they eventually resolve. This function is the singular
analog of the plural `Amp\map()` function.
- Add `Amp\Streamable` interface for buffered generator resolution
- Fix NativeReactor bug breaking tick sleep timing
v1.0.0-beta3
------------

5
lib/NativeReactor.php
View File

@ -143,9 +143,10 @@ class NativeReactor implements Reactor {
asort($this->timerOrder);
$this->isTimerSortNeeded = false;
}
$nextTimerAt = current($this->timerOrder);
// This reset() is important ... don't remove it!
$nextTimerAt = reset($this->timerOrder);
$timeToNextAlarm = round($nextTimerAt - microtime(true), 4);
$timeToNextAlaram = ($timeToNextAlarm > 0) ? $timeToNextAlarm : 0;
$timeToNextAlarm = ($timeToNextAlarm > 0) ? $timeToNextAlarm : 0;
}
if ($this->readStreams || $this->writeStreams) {

80
test/FunctionsTest.php
View File

@ -125,21 +125,23 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
}
public function testResolutionFailuresAreThrownIntoGenerator() {
$foo = function() {
$a = (yield new Success(21));
$b = 1;
try {
yield new Failure(new \Exception('test'));
$this->fail('Code path should not be reached');
} catch (\Exception $e) {
$this->assertSame('test', $e->getMessage());
$b = 2;
}
};
(new NativeReactor)->run(function($reactor) use ($foo) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
$foo = function() {
$a = (yield new Success(21));
$b = 1;
try {
yield new Failure(new \Exception('test'));
$this->fail('Code path should not be reached');
} catch (\Exception $e) {
$this->assertSame('test', $e->getMessage());
$b = 2;
}
};
$result = (yield \Amp\resolve($foo(), $reactor));
$invoked++;
});
$this->assertSame(1, $invoked);
}
/**
@ -147,7 +149,8 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
* @expectedExceptionMessage When in the chronicle of wasted time
*/
public function testUncaughtGeneratorExceptionFailsResolverPromise() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
$gen = function() {
yield;
throw new \Exception('When in the chronicle of wasted time');
@ -155,11 +158,14 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
};
yield \Amp\resolve($gen(), $reactor);
$invoked++;
});
$this->assertSame(1, $invoked);
}
public function testAllCombinatorResolution() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
list($a, $b) = (yield \Amp\all([
new Success(21),
new Success(2),
@ -167,15 +173,20 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
$result = ($a * $b);
$this->assertSame(42, $result);
$invoked++;
});
$this->assertSame(1, $invoked);
}
public function testAllCombinatorResolutionWithNonPromises() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
list($a, $b, $c) = (yield \Amp\all([new Success(21), new Success(2), 10]));
$result = ($a * $b * $c);
$this->assertSame(420, $result);
$invoked++;
});
$this->assertSame(1, $invoked);
}
/**
@ -192,7 +203,8 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
}
public function testExplicitAllCombinatorResolution() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
list($a, $b, $c) = (yield \Amp\all([
new Success(21),
new Success(2),
@ -200,18 +212,23 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
]));
$this->assertSame(420, ($a * $b * $c));
$invoked++;
});
$this->assertSame(1, $invoked);
}
public function testExplicitAnyCombinatorResolution() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
list($errors, $results) = (yield \Amp\any([
'a' => new Success(21),
'b' => new Failure(new \Exception('test')),
]));
$this->assertSame('test', $errors['b']->getMessage());
$this->assertSame(21, $results['a']);
$invoked++;
});
$this->assertSame(1, $invoked);
}
/**
@ -227,20 +244,25 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
});
}
public function testCoroutineReturnValue() {
$co = function() {
yield;
yield "return" => 42;
yield;
};
(new NativeReactor)->run(function($reactor) use ($co) {
$result = (yield \Amp\resolve($co()));
public function testCoroutineFauxReturnValue() {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
$co = function() use (&$invoked) {
yield;
yield "return" => 42;
yield;
$invoked++;
};
$result = (yield \Amp\resolve($co(), $reactor));
$this->assertSame(42, $result);
});
$this->assertSame(1, $invoked);
}
public function testCoroutineResolutionBuffersYieldedPromiseStream() {
(new NativeReactor)->run(function($reactor) {
$invoked = 0;
(new NativeReactor)->run(function($reactor) use (&$invoked) {
$i = 0;
$promisor = new Deferred;
$reactor->repeat(function($reactor, $watcherId) use (&$i, $promisor) {
$i++;
@ -253,7 +275,9 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
$result = (yield new PromiseStream($promisor->promise()));
$this->assertSame([1, 2, 3], $result);
$invoked++;
});
$this->assertSame(1, $invoked);
}
/**
@ -263,7 +287,7 @@ class FunctionsTest extends \PHPUnit_Framework_TestCase {
public function testCoroutineResolutionThrowsOnPromiseStreamBufferFailure() {
(new NativeReactor)->run(function($reactor) {
$promisor = new Deferred;
$reactor->repeat(function($reactor, $watcherId) use (&$i, $promisor) {
$reactor->repeat(function($reactor, $watcherId) use ($promisor) {
$promisor->fail(new \Exception("test"));
}, 10);