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

Do not call uv_close() if other watchers on the same stream exist

Browse Source
This commit is contained in:
Aaron Piotrowski 2017-05-11 10:39:31 -05:00
parent dd5f7ffd95
commit 3f1f9f41ca
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Loop/UvDriver.php
View File

@ -60,7 +60,7 @@ class UvDriver extends Driver {
}
foreach ($watchers as $watcher) {
if (!($watcher->type & $events)) {
if (!($watcher->enabled && $watcher->type & $events)) {
continue;
}
@ -146,11 +146,16 @@ class UvDriver extends Driver {
$event = $this->events[$watcherId];
$eventId = (int) $event;
if (empty($this->watchers[$eventId])) {
if (isset($this->io[$eventId])) {
unset($this->streams[$this->io[$eventId]], $this->io[$eventId]);
}
if ($this->watchers[$eventId] instanceof Watcher) { // All except IO watchers.
unset($this->watchers[$eventId]);
\uv_close($event);
} else {
unset($this->watchers[$eventId][$watcherId]);
if (empty($this->watchers[$eventId])) {
unset($this->watchers[$eventId], $this->streams[$this->io[$eventId]], $this->io[$eventId]);
\uv_close($event);
}
}
unset($this->events[$watcherId]);
@ -201,7 +206,7 @@ class UvDriver extends Driver {
$flags = 0;
foreach ($this->watchers[$eventId] as $watcher) {
$flags |= $watcher->type;
$flags |= $watcher->enabled ? $watcher->type : 0;
}
\uv_poll_start($event, $flags, $this->ioCallback);
break;
@ -260,33 +265,26 @@ class UvDriver extends Driver {
switch ($watcher->type) {
case Watcher::READABLE:
case Watcher::WRITABLE:
unset($this->watchers[$eventId][$id]);
$flags = 0;
foreach ($this->watchers[$eventId] as $watcher) {
$flags |= $watcher->enabled ? $watcher->type : 0;
}
if (empty($this->watchers[$eventId])) {
unset($this->watchers[$eventId]);
if (\uv_is_active($event)) {
\uv_poll_stop($event);
}
} else {
$flags = 0;
foreach ($this->watchers[$eventId] as $watcher) {
$flags |= $watcher->type;
}
if ($flags) {
\uv_poll_start($event, $flags, $this->ioCallback);
} elseif (\uv_is_active($event)) {
\uv_poll_stop($event);
}
break;
case Watcher::DELAY:
case Watcher::REPEAT:
unset($this->watchers[$eventId]);
if (\uv_is_active($event)) {
\uv_timer_stop($event);
}
break;
case Watcher::SIGNAL:
unset($this->watchers[$eventId]);
if (\uv_is_active($event)) {
\uv_signal_stop($event);
}