8000 Refactor and simplify signal handling logic by clue · Pull Request #150 · reactphp/event-loop · GitHub
[go: up one dir, main page]
Skip to content

Refactor and simplify signal handling logic #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 6, 2018
Merged

Refactor and simplify signal handling logic #150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6c7785
Simplify removing signal handlers
clue Jan 15, 2018
8afd1f3
Simplify adding signal handlers
clue Jan 15, 2018
3e4421b
Simplify checking signal watchers and remove circular reference
clue Jan 20, 2018
f261f47
Avoid cyclic callback references
clue Jan 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Simplify removing signal handlers
  • Loading branch information
@clue
clue committed Feb 6, 2018
commit e6c7785fb278fda573f856be6417345bad8b3901
11 changes: 5 additions & 6 deletions src/ExtEventLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ function ($signal) {
$f = $g;
});
$this->signalEvents[$signal]->add();
},
function ($signal) {
if ($this->signals->count($signal) === 0) {
$this->signalEvents[$signal]->free();
unset($this->signalEvents[$signal]);
}
}
);

Expand Down Expand Up @@ -172,6 +166,11 @@ public function addSignal($signal, $listener)
public function removeSignal($signal, $listener)
{
$this->signals->remove($signal, $listener);

if (isset($this->signalEvents[$signal]) && $this->signals->count($signal) === 0) {
$this->signalEvents[$signal]->free();
unset($this->signalEvents[$signal]);
}
}

public function run()
Expand Down
13 changes: 6 additions & 7 deletions src/ExtLibevLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ function ($signal) {
$f = $g;
}, $signal);
$this->loop->add($this->signalEvents[$signal]);
},
function ($signal) {
if ($this->signals->count($signal) === 0) {
$this->signalEvents[$signal]->stop();
$this->loop->remove($this->signalEvents[$signal]);
unset($this->signalEvents[$signal]);
}
}
);
}
Expand Down Expand Up @@ -172,6 +165,12 @@ public function addSignal($signal, $listener)
public function removeSignal($signal, $listener)
{
$this->signals->remove($signal, $listener);

if (isset($this->signalEvents[$signal]) && $this->signals->count($signal) === 0) {
$this->signalEvents[$signal]->stop();
$this->loop->remove($this->signalEvents[$signal]);
unset($this->signalEvents[$signal]);
}
}

public function run()
Expand Down
13 changes: 6 additions & 7 deletions src/ExtLibeventLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,6 @@ function ($signal) {
});
event_base_set($this->signalEvents[$signal], $this->eventBase);
event_add($this->signalEvents[$signal]);
},
function ($signal) {
if ($this->signals->count($signal) === 0) {
event_del($this->signalEvents[$signal]);
event_free($this->signalEvents[$signal]);
unset($this->signalEvents[$signal]);
}
}
);

Expand Down Expand Up @@ -190,6 +183,12 @@ public function addSignal($signal, $listener)
public function removeSignal($signal, $listener)
{
$this->signals->remove($signal, $listener);

if (isset($this->signalEvents[$signal]) && $this->signals->count($signal) === 0) {
event_del($this->signalEvents[$signal]);
event_free($this->signalEvents[$signal]);
unset($this->signalEvents[$signal]);
}
}

public function run()
Expand Down
15 changes: 1 addition & 14 deletions src/SignalsHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,11 @@ final class SignalsHandler
private $timer;
private $signals = [];
private $on;
private $off;

public function __construct(LoopInterface $loop, $on, $off)
public function __construct(LoopInterface $loop, $on)
{
$this->loop = $loop;
$this->on = $on;
$this->off = $off;
}

public function __destruct()
{
$off = $this->off;
foreach ($this->signals as $signal => $listeners) {
$off($signal);
}
}

public function add($signal, $listener)
Expand Down Expand Up @@ -62,9 +52,6 @@ public function remove($signal, $listener)

if (isset($this->signals[$signal]) && \count($this->signals[$signal]) === 0) {
unset($this->signals[$signal]);

$off = $this->off;
$off($signal);
}

if (empty($this->signals) && $this->timer instanceof TimerInterface) {
Expand Down
13 changes: 8 additions & 5 deletions src/StreamSelectLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ function ($signal) {
$g = $f;
$f = $g;
});
},
function ($signal) {
if ($this->signals->count($signal) === 0) {
\pcntl_signal($signal, SIG_DFL);
}
}
);
}
Expand Down Expand Up @@ -168,7 +163,15 @@ public function addSignal($signal, $listener)

public function removeSignal($signal, $listener)
{
if (!$this->signals->count($signal)) {
return;
}

$this->signals->remove($signal, $listener);

if ($this->signals->count($signal) === 0) {
\pcntl_signal($signal, SIG_DFL);
}
}

public function run()
Expand Down
6 changes: 6 additions & 0 deletions tests/AbstractLoopTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,12 @@ function () {
$this->loop->run();
}

public function testRemoveSignalNotRegisteredIsNoOp()
{
$this->loop->removeSignal(SIGINT, function () { });
$this->assertTrue(true);
}

public function testSignal()
{
if (!function_exists('posix_kill') || !function_exists('posix_getpid')) {
Expand Down
17 changes: 0 additions & 17 deletions tests/SignalsHandlerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,82 +11,65 @@ public function testEmittedEventsAndCallHandling()
{
$callCount = 0;
$onCount = 0;
$offCount = 0;
$func = function () use (&$callCount) {
$callCount++;
};
$signals = new SignalsHandler(
Factory::create(),
function () use (&$onCount) {
$onCount++;
},
function () use (&$offCount) {
$offCount++;
}
);

$this->assertSame(0, $callCount);
$this->assertSame(0, $onCount);
$this->assertSame(0, $offCount);

$signals->add(SIGUSR1, $func);
$this->assertSame(0, $callCount);
$this->assertSame(1, $onCount);
$this->assertSame(0, $offCount);

$signals->add(SIGUSR1, $func);
$this->assertSame(0, $callCount);
$this->assertSame(1, $onCount);
$this->assertSame(0, $offCount);

$signals->add(SIGUSR1, $func);
$this->assertSame(0, $callCount);
$this->assertSame(1, $onCount);
$this->assertSame(0, $offCount);

$signals->call(SIGUSR1);
$this->assertSame(1, $callCount);
$this->assertSame(1, $onCount);
$this->assertSame(0, $offCount);

$signals->add(SIGUSR2, $func);
$this->assertSame(1, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(0, $offCount);

$signals->add(SIGUSR2, $func);
$this->assertSame(1, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(0, $offCount);

$signals->call(SIGUSR2);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(0, $offCount);

$signals->remove(SIGUSR2, $func);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(1, $offCount);

$signals->remove(SIGUSR2, $func);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(1, $offCount);

$signals->call(SIGUSR2);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(1, $offCount);

$signals->remove(SIGUSR1, $func);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(2, $offCount);

$signals->call(SIGUSR1);
$this->assertSame(2, $callCount);
$this->assertSame(2, $onCount);
$this->assertSame(2, $offCount);
}
}
0