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 UvReactor bugs

Browse Source
This commit is contained in:
Daniel Lowrey 2015-05-25 12:47:04 -04:00
parent f024061d22
commit 0c0395f7a0
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/UvReactor.php
View File

@ -196,7 +196,7 @@ class UvReactor implements SignalReactor {
$watcher = new \StdClass;
$watcher->id = $watcherId = $this->lastWatcherId++;
$watcher->type = ($isRepeating) ? Watcher::TIMER_ONCE : Watcher::TIMER_REPEAT;
$watcher->type = ($isRepeating) ? Watcher::TIMER_REPEAT : Watcher::TIMER_ONCE;
$watcher->uvHandle = uv_timer_init($this->loop);
$watcher->callback = $this->wrapTimerCallback($watcher, $callback);
$watcher->callbackData = @$options["cb_data"];
@ -242,7 +242,7 @@ class UvReactor implements SignalReactor {
}
}
private tryUserErrorCallback(\Exception $e) {
private function tryUserErrorCallback(\Exception $e) {
try {
call_user_func($this->onError, $e);
} catch (\Exception $e) {
@ -319,25 +319,26 @@ class UvReactor implements SignalReactor {
$streamId = (int) $stream;
return $this->streamIdPollMap[$streamId] = (object) [
"readers" = [],
"writers" = [],
"disable" = [],
"flags" => 0,
"handle" => $pollInitFunc($this->loop, $stream),
"callback" => function($uvHandle, $stat, $events) use ($poll) {
if ($events & \UV::READABLE) {
foreach ($poll->readers as $watcher) {
$this->invokePollWatcher($watcher);
}
}
if ($events & \UV::WRITABLE) {
foreach ($poll->writers as $watcher) {
$this->invokePollWatcher($watcher);
}
$poll = new \StdClass;
$poll->readers = [];
$poll->writers = [];
$poll->disable = [];
$poll->flags = 0;
$poll->handle = \call_user_func($pollInitFunc, $this->loop, $stream);
$poll->callback = function($uvHandle, $stat, $events) use ($poll) {
if ($events & \UV::READABLE) {
foreach ($poll->readers as $watcher) {
$this->invokePollWatcher($watcher);
}
}
];
if ($events & \UV::WRITABLE) {
foreach ($poll->writers as $watcher) {
$this->invokePollWatcher($watcher);
}
}
};
return $this->streamIdPollMap[$streamId] = $poll;
}
private function chooseWindowsPollingFunction($stream) {

13
test/ReactorTest.php
View File

@ -131,16 +131,13 @@ abstract class ReactorTest extends \PHPUnit_Framework_TestCase {
public function testRunExecutesEventsUntilExplicitlyStopped() {
$reactor = $this->getReactor();
$increment = 0;
$reactor->repeat(function() use (&$increment, $reactor) {
if ($increment < 10) {
$increment++;
} else {
$reactor->stop();
$reactor->repeat(function($reactor, $watcherId) use (&$increment) {
$increment++;
if ($increment === 10) {
$reactor->cancel($watcherId);
}
}, $msInterval = 1);
}, $msInterval = 5);
$reactor->run();