Introduce CpuCoreCounter

ondrejmirtes · ondrejmirtes · commit ba305ca2e6a4 · 2020-09-03T16:20:34.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -514,6 +514,9 @@ services:
 	-
 		class: PHPStan\Parser\FunctionCallStatementFinder
 
+	-
+		class: PHPStan\Process\CpuCoreCounter
+
 	-
 		implement: PHPStan\Reflection\FunctionReflectionFactory
 
diff --git a/src/Command/AnalyserRunner.php b/src/Command/AnalyserRunner.php
@@ -6,6 +6,7 @@
 use PHPStan\Analyser\AnalyserResult;
 use PHPStan\Parallel\ParallelAnalyser;
 use PHPStan\Parallel\Scheduler;
+use PHPStan\Process\CpuCoreCounter;
 use Symfony\Component\Console\Input\InputInterface;
 
 class AnalyserRunner
@@ -17,15 +18,19 @@ class AnalyserRunner
 
 	private ParallelAnalyser $parallelAnalyser;
 
+	private CpuCoreCounter $cpuCoreCounter;
+
 	public function __construct(
 		Scheduler $scheduler,
 		Analyser $analyser,
-		ParallelAnalyser $parallelAnalyser
+		ParallelAnalyser $parallelAnalyser,
+		CpuCoreCounter $cpuCoreCounter
 	)
 	{
 		$this->scheduler = $scheduler;
 		$this->analyser = $analyser;
 		$this->parallelAnalyser = $parallelAnalyser;
+		$this->cpuCoreCounter = $cpuCoreCounter;
 	}
 
 	/**
@@ -54,7 +59,7 @@ public function runAnalyser(
 			return new AnalyserResult([], [], [], [], false);
 		}
 
-		$schedule = $this->scheduler->scheduleWork($this->getNumberOfCpuCores(), $files);
+		$schedule = $this->scheduler->scheduleWork($this->cpuCoreCounter->getNumberOfCpuCores(), $files);
 		$mainScript = null;
 		if (isset($_SERVER['argv'][0]) && file_exists($_SERVER['argv'][0])) {
 			$mainScript = $_SERVER['argv'][0];
@@ -77,39 +82,4 @@ public function runAnalyser(
 		);
 	}
 
-	private function getNumberOfCpuCores(): int
-	{
-		// from brianium/paratest
-		$cores = 2;
-		if (is_file('/proc/cpuinfo')) {
-			// Linux (and potentially Windows with linux sub systems)
-			$cpuinfo = @file_get_contents('/proc/cpuinfo');
-			if ($cpuinfo !== false) {
-				preg_match_all('/^processor/m', $cpuinfo, $matches);
-				return count($matches[0]);
-			}
-		}
-
-		if (\DIRECTORY_SEPARATOR === '\\') {
-			// Windows
-			$process = @popen('wmic cpu get NumberOfLogicalProcessors', 'rb');
-			if ($process !== false) {
-				fgets($process);
-				$cores = (int) fgets($process);
-				pclose($process);
-			}
-
-			return $cores;
-		}
-
-		$process = @\popen('sysctl -n hw.ncpu', 'rb');
-		if ($process !== false) {
-			// *nix (Linux, BSD and Mac)
-			$cores = (int) fgets($process);
-			pclose($process);
-		}
-
-		return $cores;
-	}
-
 }
diff --git a/src/Process/CpuCoreCounter.php b/src/Process/CpuCoreCounter.php
@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Process;
+
+class CpuCoreCounter
+{
+
+	private ?int $count = null;
+
+	public function getNumberOfCpuCores(): int
+	{
+		if ($this->count !== null) {
+			return $this->count;
+		}
+
+		// from brianium/paratest
+		$cores = 2;
+		if (is_file('/proc/cpuinfo')) {
+			// Linux (and potentially Windows with linux sub systems)
+			$cpuinfo = @file_get_contents('/proc/cpuinfo');
+			if ($cpuinfo !== false) {
+				preg_match_all('/^processor/m', $cpuinfo, $matches);
+				return $this->count = count($matches[0]);
+			}
+		}
+
+		if (\DIRECTORY_SEPARATOR === '\\') {
+			// Windows
+			$process = @popen('wmic cpu get NumberOfLogicalProcessors', 'rb');
+			if ($process !== false) {
+				fgets($process);
+				$cores = (int) fgets($process);
+				pclose($process);
+			}
+
+			return $this->count = $cores;
+		}
+
+		$process = @\popen('sysctl -n hw.ncpu', 'rb');
+		if ($process !== false) {
+			// *nix (Linux, BSD and Mac)
+			$cores = (int) fgets($process);
+			pclose($process);
+		}
+
+		return $this->count = $cores;
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,9 @@ services:`
`514`	`514`	`-`
`515`	`515`	`class: PHPStan\Parser\FunctionCallStatementFinder`
`516`	`516`
	`517`	`+ -`
	`518`	`+ class: PHPStan\Process\CpuCoreCounter`
	`519`	`+`
`517`	`520`	`-`
`518`	`521`	`implement: PHPStan\Reflection\FunctionReflectionFactory`
`519`	`522`