Improve CPU cores count detection (#189)

Author: theofidry

composer.json

@@ -15,6 +15,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
+        "fidry/cpu-core-counter": "^0.3.0",
         "nikic/iter": "^2.2",
         "psr/log": "^1.1 || ^2.0 || ^3.0",
         "symfony/console": "^4.4 || ^5.4 || ^6.0",

src/CpuCoreCounter.php

@@ -13,11 +13,12 @@
 
 namespace Webmozarts\Console\Parallelization;
 
+use Fidry\CpuCoreCounter\CpuCoreCounter as FidryCpuCoreCounter;
+use Fidry\CpuCoreCounter\NumberOfCpuCoreNotFound;
 use Webmozart\Assert\Assert;
 
 /**
  * @internal
- * From https://github.com/phpstan/phpstan-src/blob/1.8.x/src/Process/CpuCoreCounter.php
  */
 final class CpuCoreCounter
 {
@@ -32,11 +33,7 @@ public static function getNumberOfCpuCores(): int
             return self::$count;
         }
 
-        if (!function_exists('proc_open')) {
-            return self::$count = 1;
-        }
-
-        $count = $_ENV['WEBMOZARTS_CONSOLE_PARALLELIZATION_CPU_COUNT'];
+        $count = $_ENV['WEBMOZARTS_CONSOLE_PARALLELIZATION_CPU_COUNT'] ?? false;
 
         if (false !== $count) {
             Assert::numeric($count);
@@ -45,38 +42,12 @@ public static function getNumberOfCpuCores(): int
             return self::$count = (int) $count;
         }
 
-        // from brianium/paratest
-        if (@is_file('/proc/cpuinfo')) {
-            // Linux (and potentially Windows with linux sub systems)
-            $cpuinfo = @file_get_contents('/proc/cpuinfo');
-            if (false !== $cpuinfo) {
-                preg_match_all('/^processor/m', $cpuinfo, $matches);
-
-                return self::$count = count($matches[0]);
-            }
-        }
-
-        if (DIRECTORY_SEPARATOR === '\\') {
-            // Windows
-            $process = @popen('wmic cpu get NumberOfLogicalProcessors', 'rb');
-            if (is_resource($process)) {
-                fgets($process);
-                $cores = (int) fgets($process);
-                pclose($process);
-
-                return self::$count = $cores;
-            }
-        }
-
-        $process = @popen('sysctl -n hw.ncpu', 'rb');
-        if (is_resource($process)) {
-            // *nix (Linux, BSD and Mac)
-            $cores = (int) fgets($process);
-            pclose($process);
-
-            return self::$count = $cores;
+        try {
+            self::$count = (new FidryCpuCoreCounter())->getCount();
+        } catch (NumberOfCpuCoreNotFound $exception) {
+            self::$count = 1;
         }
 
-        return self::$count = 2;
+        return self::$count;
     }
 }

tests/CpuCoreCounterTest.php

@@ -22,8 +22,13 @@
  */
 final class CpuCoreCounterTest extends TestCase
 {
+    /**
+     * @backupGlobals
+     */
     public function test_can_get_the_number_of_cpu_cores(): void
     {
+        unset($_ENV['WEBMOZARTS_CONSOLE_PARALLELIZATION_CPU_COUNT']);
+
         $cpuCoresCount = CpuCoreCounter::getNumberOfCpuCores();
 
         self::assertGreaterThan(0, $cpuCoresCount);