Merge pull request #2517 from PaulBone/num_cores

Make the number of physical CPU cores detection more robust
facebook · Mar 8, 2021 · a3feed8 · a3feed8
2 parents 3d6c903 + 4d6c78f
commit a3feed8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/programs/util.c b/programs/util.c
@@ -1212,12 +1212,17 @@ int UTIL_countPhysicalCores(void)
                 /* fall back on the sysconf value */
                 goto failed;
         }   }
-        if (siblings && cpu_cores) {
+        if (siblings && cpu_cores && siblings > cpu_cores) {
             ratio = siblings / cpu_cores;
         }
+
+        if (ratio && numPhysicalCores > ratio) {
+            numPhysicalCores = numPhysicalCores / ratio;
+        }
+
 failed:
         fclose(cpuinfo);
-        return numPhysicalCores = numPhysicalCores / ratio;
+        return numPhysicalCores;
     }
 }