danog/amp
1
0
Fork 0
mirror of https://github.com/danog/amp.git synced 2024-11-26 20:15:00 +01:00
Code Issues Projects Releases Wiki Activity

Set next "now" at the beginning of watcher activation

Browse Source
This commit is contained in:
Aaron Piotrowski 2017-04-20 11:13:17 -05:00
parent 76e0913d9b
commit 628d8cbab1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Loop/EventDriver.php
View File

@ -179,6 +179,8 @@ class EventDriver extends Driver {
* {@inheritdoc}
*/
protected function activate(array $watchers) {
$now = (int) (\microtime(true) * self::MILLISEC_PER_SEC);
foreach ($watchers as $watcher) {
if (!isset($this->events[$id = $watcher->id])) {
switch ($watcher->type) {
@ -233,7 +235,7 @@ class EventDriver extends Driver {
switch ($watcher->type) {
case Watcher::DELAY:
case Watcher::REPEAT:
$interval = $watcher->value - ($diff ?? ($diff = (int) (\microtime(true) * self::MILLISEC_PER_SEC) - $this->now));
$interval = $watcher->value - ($now - $this->now);
$this->events[$id]->add($interval > 0 ? $interval / self::MILLISEC_PER_SEC : 0);
break;
@ -247,7 +249,7 @@ class EventDriver extends Driver {
}
}
$this->now = (int) (\microtime(true) * self::MILLISEC_PER_SEC);
$this->now = $now;
}
/**

4
lib/Loop/NativeDriver.php
View File

@ -239,6 +239,8 @@ class NativeDriver extends Driver {
* {@inheritdoc}
*/
protected function activate(array $watchers) {
$now = (int) (\microtime(true) * self::MILLISEC_PER_SEC);
foreach ($watchers as $watcher) {
switch ($watcher->type) {
case Watcher::READABLE:
@ -281,7 +283,7 @@ class NativeDriver extends Driver {
}
}
$this->now = (int) (\microtime(true) * self::MILLISEC_PER_SEC);
$this->now = $now;
}
/**