danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Kill children on error and check if stream is closed before writing from child. (#5682)

Browse Source 
* Kill children on error and check if stream is closed before writing from child.

* Use SIGTERM to kill children, reap children on error.
This commit is contained in:
AndrolGenhald 2021-04-30 08:01:24 -05:00 committed by GitHub
parent fb5c5a9c59
commit 79fcf79219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ class Pool
$bytes_to_write = strlen($serialized_message);
$bytes_written = 0;
while ($bytes_written < $bytes_to_write) {
while ($bytes_written < $bytes_to_write && !feof($write_stream)) {
// attempt to write the remaining unsent part
$bytes_written += @fwrite($write_stream, substr($serialized_message, $bytes_written));
@ -354,6 +354,14 @@ class Pool
($this->task_done_closure)($message->data);
}
} elseif ($message instanceof ForkProcessErrorMessage) {
// Kill all children
foreach ($this->child_pid_list as $child_pid) {
/**
* @psalm-suppress UndefinedConstant - does not exist on windows
* @psalm-suppress MixedArgument
*/
posix_kill($child_pid, \SIGTERM);
}
throw new \Exception($message->message);
} else {
error_log('Child should return ForkMessage - response type=' . gettype($message));
@ -385,38 +393,46 @@ class Pool
*/
public function wait(): array
{
// Read all the streams from child processes into an array.
$content = $this->readResultsFromChildren();
$ignore_return_code = false;
try {
// Read all the streams from child processes into an array.
$content = $this->readResultsFromChildren();
} catch (\Throwable $e) {
// If children were killed because one of them threw an exception we don't care about return codes.
$ignore_return_code = true;
// PHP guarantees finally is run even after throwing
throw $e;
} finally {
// Wait for all children to return
foreach ($this->child_pid_list as $child_pid) {
$process_lookup = posix_kill($child_pid, 0);
// Wait for all children to return
foreach ($this->child_pid_list as $child_pid) {
$process_lookup = posix_kill($child_pid, 0);
$status = 0;
$status = 0;
if ($process_lookup) {
/**
* @psalm-suppress UndefinedConstant - does not exist on windows
* @psalm-suppress MixedArgument
*/
posix_kill($child_pid, SIGALRM);
if ($process_lookup) {
/**
* @psalm-suppress UndefinedConstant - does not exist on windows
* @psalm-suppress MixedArgument
*/
posix_kill($child_pid, SIGALRM);
if (pcntl_waitpid($child_pid, $status) < 0) {
error_log(posix_strerror(posix_get_last_error()));
if (pcntl_waitpid($child_pid, $status) < 0) {
error_log(posix_strerror(posix_get_last_error()));
}
}
}
// Check to see if the child died a graceful death
if (pcntl_wifsignaled($status)) {
$return_code = pcntl_wexitstatus($status);
$term_sig = pcntl_wtermsig($status);
// Check to see if the child died a graceful death
if (!$ignore_return_code && pcntl_wifsignaled($status)) {
$return_code = pcntl_wexitstatus($status);
$term_sig = pcntl_wtermsig($status);
/**
* @psalm-suppress UndefinedConstant - does not exist on windows
*/
if ($term_sig !== SIGALRM) {
$this->did_have_error = true;
error_log("Child terminated with return code $return_code and signal $term_sig");
/**
* @psalm-suppress UndefinedConstant - does not exist on windows
*/
if ($term_sig !== SIGALRM) {
$this->did_have_error = true;
error_log("Child terminated with return code $return_code and signal $term_sig");
}
}
}
}