Report worker peak memory when the result cache is used (#6576)

Author: alfredbez

.github/workflows/e2e-tests.yml

@@ -186,6 +186,19 @@ jobs:
               OUTPUT=$(../../bin/phpstan -vvv 2>&1)
               echo "$OUTPUT"
               ../bashunit -a contains 'Result cache restored.' "$OUTPUT"
+          - script: |
+              cd e2e/result-cache-worker-count
+              OUTPUT=$(../../bin/phpstan -vvv 2>&1)
+              echo "$OUTPUT"
+              ../bashunit -a contains 'largest of 2' "$OUTPUT"
+              # Only some files are analysed again, so the result is rebuilt from the cache
+              # and must still report the peak memory of the workers.
+              echo '// changed' >> src/Foo.php
+              echo '// changed' >> src/Bar.php
+              OUTPUT=$(../../bin/phpstan -vvv 2>&1)
+              echo "$OUTPUT"
+              ../bashunit -a contains 'Result cache restored. 2 files will be reanalysed.' "$OUTPUT"
+              ../bashunit -a contains 'largest of 2' "$OUTPUT"
           - script: |
               cd e2e/result-cache-stale-objects
               OUTPUT=$(../bashunit -a exit_code "1" "../../bin/phpstan -vvv")

.gitignore

@@ -22,3 +22,4 @@ e2e/bashunit
 /e2e/result-cache-moved-tmpdir/tmp-b
 /e2e/result-cache-stale-objects/tmp
 /e2e/result-cache-truncated/tmp
+/e2e/result-cache-worker-count/tmp

e2e/result-cache-worker-count/phpstan.neon

@@ -0,0 +1,9 @@
+parameters:
+	level: 0
+	tmpDir: tmp
+	paths:
+		- src
+	parallel:
+		jobSize: 1
+		maximumNumberOfProcesses: 2
+		minimumNumberOfJobsPerProcess: 1

e2e/result-cache-worker-count/src/Bar.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace TestResultCacheWorkerCount;
+
+class Bar
+{
+
+}

e2e/result-cache-worker-count/src/Baz.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace TestResultCacheWorkerCount;
+
+class Baz
+{
+
+}

e2e/result-cache-worker-count/src/Foo.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace TestResultCacheWorkerCount;
+
+class Foo
+{
+
+}

e2e/result-cache-worker-count/src/Qux.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace TestResultCacheWorkerCount;
+
+class Qux
+{
+
+}

src/Analyser/ResultCache/ResultCacheManager.php

@@ -1211,6 +1211,7 @@ public function process(AnalyserResult $analyserResult, ResultCache $resultCache
 			reachedInternalErrorsCountLimit: $analyserResult->hasReachedInternalErrorsCountLimit(),
 			peakMemoryUsageBytes: $analyserResult->getPeakMemoryUsageBytes(),
 			processedFiles: $analyserResult->getProcessedFiles(),
+			workerCount: $analyserResult->getWorkerCount(),
 		), $saved);
 	}
 

src/Command/AnalyseApplication.php

@@ -344,6 +344,7 @@ private function switchTmpFileInAnalyserResult(
 			reachedInternalErrorsCountLimit: $analyserResult->hasReachedInternalErrorsCountLimit(),
 			peakMemoryUsageBytes: $analyserResult->getPeakMemoryUsageBytes(),
 			processedFiles: $analyserResult->getProcessedFiles(),
+			workerCount: $analyserResult->getWorkerCount(),
 		);
 	}