stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed sysctl errors being ignored when getting the number of processors on BSD

Browse source
This commit is contained in:
Snaipe 2015-09-23 00:42:30 +02:00
parent 080c10ebad
commit ace14dc3bc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compat/processor.c
View file

@ -32,17 +32,17 @@ size_t get_processor_count(void) {
return (size_t) sysinfo.dwNumberOfProcessors;
#elif defined(BSD)
int mib[2] = { CTL_HW, HW_AVAILCPU };
long long count;
long long count = 0;
size_t len = sizeof (count);
/* get the number of CPUs from the system */
sysctl(mib, 2, &count, &len, NULL, 0);
int res = sysctl(mib, 2, &count, &len, NULL, 0);
if (count < 1) {
if (count < 1 || res == -1) {
mib[1] = HW_NCPU;
sysctl(mib, 2, &count, &len, NULL, 0);
res = sysctl(mib, 2, &count, &len, NULL, 0);
if (count < 1)
if (count < 1 || res == -1)
count = 1;
}
return (size_t) count;