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

Correctly update nextTimerAt timestamp for repeat watchers

Browse Source
This commit is contained in:
Daniel Lowrey 2015-05-10 02:36:39 -04:00
parent ed6084c333
commit 4a45502ae9
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/NativeReactor.php
View File

@ -218,9 +218,12 @@ class NativeReactor implements Reactor {
resolve($result, $this)->when($this->onCoroutineResolution);
}
if (isset($watcher->msInterval) && $watcher->isEnabled) {
if ($watcher->type === Watcher::TIMER_REPEAT && $watcher->isEnabled) {
$this->isTimerSortNeeded = true;
$watcher->nextExecutionAt += $watcher->msInterval;
$watcher->nextExecutionAt = $now + $watcher->msInterval;
if ($watcher->nextExecutionAt < $this->nextTimerAt) {
$this->nextTimerAt = $watcher->nextExecutionAt;
}
$this->timerOrder[$watcherId] = $watcher->nextExecutionAt;
} else {
unset(
@ -267,17 +270,17 @@ class NativeReactor implements Reactor {
$watcher->callback = $callback;
$watcher->callbackData = @$options["callback_data"];
$watcher->isEnabled = isset($options["enable"]) ? (bool) $options["enable"] : true;
$watcher->msDelay = $msDelay = round(($msDelay / 1000), 3);
$watcher->nextExecutionAt = null; // only needed for php5.x
$watcher->msDelay = round(($msDelay / 1000), 3);
$watcher->nextExecutionAt = null;
if ($watcher->isEnabled && $this->isRunning) {
$nextExecutionAt = microtime(true) + $msDelay;
$watcher->nextExecutionAt = microtime(true) + $msDelay;
$nextExecutionAt = microtime(true) + $watcher->msDelay;
$watcher->nextExecutionAt = $nextExecutionAt;
$this->timerOrder[$watcherId] = $nextExecutionAt;
$this->nextTimerAt = $this->nextTimerAt
? min([$this->nextTimerAt, $nextExecutionAt])
: $nextExecutionAt;
$this->isTimerSortNeeded = true;
if ($nextExecutionAt < $this->nextTimerAt) {
$this->nextTimerAt = $nextExecutionAt;
}
}
$this->watchers[$watcherId] = $watcher;
@ -310,13 +313,13 @@ class NativeReactor implements Reactor {
$watcher->nextExecutionAt = null; // only needed for php5.x
if ($watcher->isEnabled && $this->isRunning) {
$nextExecutionAt = microtime(true);
$nextExecutionAt += (isset($watcher->msDelay) ? $watcher->msDelay : $watcher->msInterval);
$increment = (isset($watcher->msDelay) ? $watcher->msDelay : $watcher->msInterval);
$nextExecutionAt = microtime(true) + $increment;
$this->timerOrder[$watcherId] = $watcher->nextExecutionAt = $nextExecutionAt;
$this->nextTimerAt = $this->nextTimerAt
? min([$this->nextTimerAt, $nextExecutionAt])
: $nextExecutionAt;
$this->isTimerSortNeeded = true;
if ($nextExecutionAt < $this->nextTimerAt) {
$this->nextTimerAt = $nextExecutionAt;
}
}
$this->watchers[$watcherId] = $watcher;
@ -467,4 +470,4 @@ class NativeReactor implements Reactor {
public function onError(callable $func) {
$this->onError = $func;
}
}
}