Skip to content

Avoid warning when catching signal with pcntl_signal() #297

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

Closed
Divi wants to merge 8 commits into from
Closed

Avoid warning when catching signal with pcntl_signal() #297

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b358cb4
Avoid warning when catching signal
Divi Apr 19, 2014
06adc4c
Avoid warning when catching signal
Divi Apr 19, 2014
cb0a783
Delete fix for stream_socket_accept
Divi Apr 21, 2014
3723437
Catch signals, and try again
Divi Apr 21, 2014
4bb3e5c
Catch signals, and try again
Divi Apr 21, 2014
65a6fef
Revert Server.php changes
Divi Apr 21, 2014
5aa9e7b
Fix double signal
Divi Apr 21, 2014
1a1b353
Remove useless method in Server.php
Divi May 6, 2014
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
25 changes: 23 additions & 2 deletions src/EventLoop/StreamSelectLoop.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,17 @@ private function waitForStreamActivity($timeout)
$read = $this->readStreams;
$write = $this->writeStreams;

$this->streamSelect($read, $write, $timeout);
$n = $this->streamSelect($read, $write, $timeout);
if (false === $n) {
// if a system call has been interrupted, forget about it, let's try again and avoid warning messages.
if ($this->hasSystemCallBeenInterrupted()) {
return;
}

$this->stop();

return;
}

foreach ($read as $stream) {
$key = (int) $stream;
Expand Down Expand Up @@ -252,11 +262,22 @@ protected function streamSelect(array &$read, array &$write, $timeout)
if ($read || $write) {
$except = null;

return stream_select($read, $write, $except, $timeout === null ? null : 0, $timeout);
return @stream_select($read, $write, $except, $timeout === null ? null : 0, $timeout);
}

usleep($timeout);

return 0;
}

/**
* @return bool
*/
private function hasSystemCallBeenInterrupted()
{
$lastError = error_get_last();

// stream_select returns false when the `select` system call is interrupted by an incoming signal
return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call');

@clue clue May 6, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tests would be much appreciated 👍

Also IIRC, the error messages take the user's LOCALE into account and might be translated to another language. If so, how should we match those?

}
}