Skip to content

Commit

Permalink
ParallelAnalyser: count also main process memory at peak
Browse files Browse the repository at this point in the history
  • Loading branch information
janedbal committed Nov 29, 2022
1 parent a3160a6 commit 6220763
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/Parallel/ParallelAnalyser.php
Expand Up @@ -25,6 +25,7 @@
use function escapeshellarg;
use function is_string;
use function max;
use function memory_get_usage;
use function parse_url;
use function sprintf;
use const PHP_URL_PORT;
Expand Down Expand Up @@ -64,6 +65,7 @@ public function analyse(
$loop = new StreamSelectLoop();

$numberOfProcesses = $schedule->getNumberOfProcesses();
$someChildEnded = false;
$errors = [];
$peakMemoryUsages = [];
$internalErrors = [];
Expand Down Expand Up @@ -198,7 +200,12 @@ public function analyse(

$job = array_pop($jobs);
$process->request(['action' => 'analyse', 'files' => $job]);
}, $handleError, function ($exitCode, string $output) use (&$internalErrors, &$internalErrorsCount, $processIdentifier): void {
}, $handleError, function ($exitCode, string $output) use (&$someChildEnded, &$peakMemoryUsages, &$internalErrors, &$internalErrorsCount, $processIdentifier): void {
if ($someChildEnded === false) {
$peakMemoryUsages['main'] = memory_get_usage(true);
}
$someChildEnded = true;

$this->processPool->tryQuitProcess($processIdentifier);
if ($exitCode === 0) {
return;
Expand Down

0 comments on commit 6220763

Please sign in to comment.