Merge pull request #2517 from PaulBone/num_cores
Make the number of physical CPU cores detection more robust
This commit is contained in:
commit
a3feed8dcd
@ -1212,12 +1212,17 @@ int UTIL_countPhysicalCores(void)
|
|||||||
/* fall back on the sysconf value */
|
/* fall back on the sysconf value */
|
||||||
goto failed;
|
goto failed;
|
||||||
} }
|
} }
|
||||||
if (siblings && cpu_cores) {
|
if (siblings && cpu_cores && siblings > cpu_cores) {
|
||||||
ratio = siblings / cpu_cores;
|
ratio = siblings / cpu_cores;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ratio && numPhysicalCores > ratio) {
|
||||||
|
numPhysicalCores = numPhysicalCores / ratio;
|
||||||
|
}
|
||||||
|
|
||||||
failed:
|
failed:
|
||||||
fclose(cpuinfo);
|
fclose(cpuinfo);
|
||||||
return numPhysicalCores = numPhysicalCores / ratio;
|
return numPhysicalCores;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user