Show combined memory usage in parallel mode

src/Analyser/Analyser.php

@@ -10,6 +10,7 @@
 use function array_fill_keys;
 use function array_merge;
 use function count;
+use function memory_get_peak_usage;
 use function sprintf;
 
 class Analyser
@@ -110,6 +111,7 @@ public function analyse(
 			$internalErrorsCount === 0 ? $dependencies : null,
 			$exportedNodes,
 			$reachedInternalErrorsCountLimit,
+			memory_get_peak_usage(true),
 		);
 	}
 

src/Analyser/AnalyserResult.php

@@ -26,6 +26,7 @@ public function __construct(
 		private ?array $dependencies,
 		private array $exportedNodes,
 		private bool $reachedInternalErrorsCountLimit,
+		private int $estimatedPeakMemoryUsage,
 	)
 	{
 		$this->unorderedErrors = $errors;
@@ -97,4 +98,9 @@ public function hasReachedInternalErrorsCountLimit(): bool
 		return $this->reachedInternalErrorsCountLimit;
 	}
 
+	public function getEstimatedPeakMemoryUsage(): int
+	{
+		return $this->estimatedPeakMemoryUsage;
+	}
+
 }

src/Analyser/ResultCache/ResultCacheManager.php

@@ -424,6 +424,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			$dependencies,
 			$exportedNodes,
 			$analyserResult->hasReachedInternalErrorsCountLimit(),
+			$analyserResult->getEstimatedPeakMemoryUsage(),
 		), $saved);
 	}
 

src/Command/AnalyseApplication.php

@@ -71,6 +71,7 @@ public function analyse(
 			$internalErrors = [];
 			$collectedData = [];
 			$savedResultCache = false;
+			$estimatedMemoryUsage = 0;
 			if ($errorOutput->isDebug()) {
 				$errorOutput->writeLineFormatted('Result cache was not saved because of ignoredErrorHelperResult errors.');
 			}
@@ -97,6 +98,7 @@ public function analyse(
 					$intermediateAnalyserResult->getDependencies(),
 					$intermediateAnalyserResult->getExportedNodes(),
 					$intermediateAnalyserResult->hasReachedInternalErrorsCountLimit(),
+					$intermediateAnalyserResult->getEstimatedPeakMemoryUsage(),
 				);
 			}
 
@@ -105,6 +107,8 @@ public function analyse(
 			$internalErrors = $analyserResult->getInternalErrors();
 			$errors = $analyserResult->getErrors();
 			$hasInternalErrors = count($internalErrors) > 0 || $analyserResult->hasReachedInternalErrorsCountLimit();
+			$estimatedMemoryUsage = $analyserResult->getEstimatedPeakMemoryUsage();
+
 			if (!$hasInternalErrors) {
 				foreach ($this->getCollectedDataErrors($analyserResult->getCollectedData()) as $error) {
 					$errors[] = $error;
@@ -139,6 +143,7 @@ public function analyse(
 			$defaultLevelUsed,
 			$projectConfigFile,
 			$savedResultCache,
+			$estimatedMemoryUsage,
 		);
 	}
 
@@ -195,7 +200,7 @@ private function runAnalyser(
 			$errorOutput->getStyle()->progressStart($allAnalysedFilesCount);
 			$errorOutput->getStyle()->progressAdvance($allAnalysedFilesCount);
 			$errorOutput->getStyle()->progressFinish();
-			return new AnalyserResult([], [], [], [], [], false);
+			return new AnalyserResult([], [], [], [], [], false, memory_get_peak_usage(true));
 		}
 
 		if (!$debug) {

src/Command/AnalyseCommand.php

@@ -379,6 +379,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$analysisResult->isDefaultLevelUsed(),
 					$analysisResult->getProjectConfigFile(),
 					$analysisResult->isResultCacheSaved(),
+					$analysisResult->getEstimatedPeakMemoryUsage(),
 				);
 
 				$stdOutput = $inceptionResult->getStdOutput();

src/Command/AnalyserRunner.php

@@ -14,6 +14,7 @@
 use function count;
 use function function_exists;
 use function is_file;
+use function memory_get_peak_usage;
 
 class AnalyserRunner
 {
@@ -48,7 +49,7 @@ public function runAnalyser(
 	{
 		$filesCount = count($files);
 		if ($filesCount === 0) {
-			return new AnalyserResult([], [], [], [], [], false);
+			return new AnalyserResult([], [], [], [], [], false, memory_get_peak_usage(true));
 		}
 
 		$schedule = $this->scheduler->scheduleWork($this->cpuCoreCounter->getNumberOfCpuCores(), $files);

src/Command/AnalysisResult.php

@@ -30,6 +30,7 @@ public function __construct(
 		private bool $defaultLevelUsed,
 		private ?string $projectConfigFile,
 		private bool $savedResultCache,
+		private int $estimatedPeakMemoryUsage,
 	)
 	{
 		usort(
@@ -123,4 +124,9 @@ public function isResultCacheSaved(): bool
 		return $this->savedResultCache;
 	}
 
+	public function getEstimatedPeakMemoryUsage(): int
+	{
+		return $this->estimatedPeakMemoryUsage;
+	}
+
 }

src/Command/ErrorFormatter/TableErrorFormatter.php

@@ -8,6 +8,7 @@
 use PHPStan\Command\Output;
 use PHPStan\File\RelativePathHelper;
 use PHPStan\File\SimpleRelativePathHelper;
+use PHPStan\Internal\BytesHelper;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use function array_map;
 use function count;
@@ -45,6 +46,11 @@ public function formatErrors(
 
 		if (!$analysisResult->hasErrors() && !$analysisResult->hasWarnings()) {
 			$style->success('No errors');
+
+			if ($output->isVerbose()) {
+				$output->writeLineFormatted(sprintf('Took about %s memory', BytesHelper::bytes($analysisResult->getEstimatedPeakMemoryUsage())));
+			}
+
 			if ($this->showTipsOfTheDay) {
 				if ($analysisResult->isDefaultLevelUsed()) {
 					$output->writeLineFormatted('💡 Tip of the Day:');
@@ -117,6 +123,10 @@ public function formatErrors(
 			$style->warning($finalMessage);
 		}
 
+		if ($output->isVerbose()) {
+			$output->writeLineFormatted(sprintf('Took about %s memory', BytesHelper::bytes($analysisResult->getEstimatedPeakMemoryUsage())));
+		}
+
 		return $analysisResult->getTotalErrorsCount() > 0 ? 1 : 0;
 	}
 

src/Command/FixerApplication.php

@@ -60,6 +60,7 @@
 use function is_dir;
 use function is_file;
 use function is_string;
+use function memory_get_peak_usage;
 use function min;
 use function mkdir;
 use function parse_url;
@@ -507,7 +508,7 @@ private function reanalyseAfterFileChanges(
 		$resultCache = $resultCacheManager->restore($inceptionFiles, false, false, $projectConfigArray, $inceptionResult->getErrorOutput(), $fixerSuggestionId);
 		if (count($resultCache->getFilesToAnalyse()) === 0) {
 			$result = $resultCacheManager->process(
-				new AnalyserResult([], [], [], [], [], false),
+				new AnalyserResult([], [], [], [], [], false, memory_get_peak_usage(true)),
 				$resultCache,
 				$inceptionResult->getErrorOutput(),
 				false,

src/Command/FixerWorkerCommand.php

@@ -268,6 +268,7 @@ private function switchTmpFileInAnalyserResult(
 			$dependencies,
 			$exportedNodes,
 			$analyserResult->hasReachedInternalErrorsCountLimit(),
+			$analyserResult->getEstimatedPeakMemoryUsage(),
 		);
 	}
 

src/Command/InceptionResult.php

@@ -3,9 +3,6 @@
 namespace PHPStan\Command;
 
 use PHPStan\DependencyInjection\Container;
-use PHPStan\Internal\BytesHelper;
-use function memory_get_peak_usage;
-use function sprintf;
 
 class InceptionResult
 {
@@ -81,10 +78,6 @@ public function getGenerateBaselineFile(): ?string
 
 	public function handleReturn(int $exitCode): int
 	{
-		if ($this->getErrorOutput()->isVerbose()) {
-			$this->getErrorOutput()->writeLineFormatted(sprintf('Used memory: %s', BytesHelper::bytes(memory_get_peak_usage(true))));
-		}
-
 		return $exitCode;
 	}
 

src/Command/WorkerCommand.php

@@ -30,6 +30,7 @@
 use function is_array;
 use function is_bool;
 use function is_string;
+use function memory_get_peak_usage;
 use function sprintf;
 
 class WorkerCommand extends Command
@@ -242,6 +243,7 @@ private function runWorker(
 				'result' => [
 					'errors' => $errors,
 					'collectedData' => $collectedData,
+					'memoryUsage' => memory_get_peak_usage(true),
 					'dependencies' => $dependencies,
 					'exportedNodes' => $exportedNodes,
 					'filesCount' => count($files),

src/Parallel/ParallelAnalyser.php

@@ -19,6 +19,7 @@
 use function array_map;
 use function array_pop;
 use function array_reverse;
+use function array_sum;
 use function count;
 use function defined;
 use function escapeshellarg;
@@ -64,6 +65,7 @@ public function analyse(
 
 		$numberOfProcesses = $schedule->getNumberOfProcesses();
 		$errors = [];
+		$peakMemoryUsages = [];
 		$internalErrors = [];
 		$collectedData = [];
 
@@ -138,7 +140,7 @@ public function analyse(
 				$commandOptions,
 				$input,
 			), $loop, $this->processTimeout);
-			$process->start(function (array $json) use ($process, &$internalErrors, &$errors, &$collectedData, &$dependencies, &$exportedNodes, &$jobs, $postFileCallback, &$internalErrorsCount, &$reachedInternalErrorsCountLimit, $processIdentifier): void {
+			$process->start(function (array $json) use ($process, &$internalErrors, &$errors, &$collectedData, &$dependencies, &$exportedNodes, &$peakMemoryUsages, &$jobs, $postFileCallback, &$internalErrorsCount, &$reachedInternalErrorsCountLimit, $processIdentifier): void {
 				foreach ($json['errors'] as $jsonError) {
 					if (is_string($jsonError)) {
 						$internalErrors[] = sprintf('Internal error: %s', $jsonError);
@@ -179,6 +181,10 @@ public function analyse(
 					$postFileCallback($json['filesCount']);
 				}
 
+				if (!isset($peakMemoryUsages[$processIdentifier]) || $peakMemoryUsages[$processIdentifier] < $json['memoryUsage']) {
+					$peakMemoryUsages[$processIdentifier] = $json['memoryUsage'];
+				}
+
 				$internalErrorsCount += $json['internalErrorsCount'];
 				if ($internalErrorsCount >= $this->internalErrorsCountLimit) {
 					$reachedInternalErrorsCountLimit = true;
@@ -221,6 +227,7 @@ public function analyse(
 			$internalErrorsCount === 0 ? $dependencies : null,
 			$exportedNodes,
 			$reachedInternalErrorsCountLimit,
+			(int) array_sum($peakMemoryUsages), // not 100% correct as the peak usages of workers might not have met
 		);
 	}
 

src/Testing/ErrorFormatterTestCase.php

@@ -100,6 +100,7 @@ protected function getAnalysisResult(int $numFileErrors, int $numGenericErrors):
 			false,
 			null,
 			true,
+			0,
 		);
 	}
 

tests/PHPStan/Command/AnalysisResultTest.php

@@ -43,6 +43,7 @@ public function testErrorsAreSortedByFileNameAndLine(): void
 				false,
 				null,
 				true,
+				0,
 			))->getFileSpecificErrors(),
 		);
 	}

tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php

@@ -148,6 +148,7 @@ public function testFormatErrorMessagesRegexEscape(): void
 			false,
 			null,
 			true,
+			0,
 		);
 		$formatter->formatErrors(
 			$result,
@@ -185,6 +186,7 @@ public function testEscapeDiNeon(): void
 			false,
 			null,
 			true,
+			0,
 		);
 
 		$formatter->formatErrors(
@@ -249,6 +251,7 @@ public function testOutputOrdering(array $errors): void
 			false,
 			null,
 			true,
+			0,
 		);
 
 		$formatter->formatErrors(
@@ -406,6 +409,7 @@ public function testEndOfFileNewlines(
 			false,
 			null,
 			true,
+			0,
 		);
 
 		$resource = fopen('php://memory', 'w', false);

tests/PHPStan/Command/ErrorFormatter/CheckstyleErrorFormatterTest.php

@@ -154,6 +154,7 @@ public function testTraitPath(): void
 			false,
 			null,
 			true,
+			0,
 		), $this->getOutput());
 		$this->assertXmlStringEqualsXmlString('<checkstyle>
 	<file name="FooTrait.php">

tests/PHPStan/Command/ErrorFormatter/TableErrorFormatterTest.php

@@ -210,7 +210,7 @@ public function testEditorUrlWithTrait(): void
 	{
 		$formatter = $this->createErrorFormatter('editor://%file%/%line%');
 		$error = new Error('Test', 'Foo.php (in context of trait)', 12, true, 'Foo.php', 'Bar.php');
-		$formatter->formatErrors(new AnalysisResult([$error], [], [], [], [], false, null, true), $this->getOutput());
+		$formatter->formatErrors(new AnalysisResult([$error], [], [], [], [], false, null, true, 0), $this->getOutput());
 
 		$this->assertStringContainsString('Bar.php', $this->getOutputContent());
 	}
@@ -219,7 +219,7 @@ public function testEditorUrlWithRelativePath(): void
 	{
 		$formatter = $this->createErrorFormatter('editor://custom/path/%relFile%/%line%');
 		$error = new Error('Test', 'Foo.php', 12, true, self::DIRECTORY_PATH . '/rel/Foo.php');
-		$formatter->formatErrors(new AnalysisResult([$error], [], [], [], [], false, null, true), $this->getOutput(true));
+		$formatter->formatErrors(new AnalysisResult([$error], [], [], [], [], false, null, true, 0), $this->getOutput(true));
 
 		$this->assertStringContainsString('editor://custom/path/rel/Foo.php', $this->getOutputContent(true));
 	}
@@ -244,6 +244,7 @@ public function testBug6727(): void
 				false,
 				null,
 				true,
+				0,
 			),
 			$this->getOutput(),
 		);