danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2994 (#3016)

Browse Source 
More carefully handling stream_select errors when system call is interrupted. It can be detected by parsing error message. If it is interrupted, just try again.
This commit is contained in:
m0003r 2020-03-26 04:25:33 +03:00 committed by GitHub
parent f94ab22a5f
commit 71826ad69e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Psalm/Internal/Fork/Pool.php
View File

@ -9,6 +9,7 @@ use function base64_decode;
use function base64_encode;
use function count;
use function error_log;
use function error_get_last;
use function explode;
use function extension_loaded;
use function fclose;
@ -38,6 +39,7 @@ use const STREAM_SOCK_STREAM;
use function stream_socket_pair;
use function strlen;
use function strpos;
use function stripos;
use function substr;
use function unserialize;
use function usleep;
@ -309,10 +311,17 @@ class Pool
$needs_except = null;
// Wait for data on at least one stream.
$num = stream_select($needs_read, $needs_write, $needs_except, null /* no timeout */);
$num = @stream_select($needs_read, $needs_write, $needs_except, null /* no timeout */);
if ($num === false) {
error_log('unable to select on read stream');
exit(self::EXIT_FAILURE);
$err = error_get_last();
// stream_select returns false when the `select` system call is interrupted by an incoming signal
if (isset($err['message']) && stripos($err['message'], 'interrupted system call') === false) {
error_log('unable to select on read stream');
exit(self::EXIT_FAILURE);
}
continue;
}
// For each stream that was ready, read the content.