]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: threads: Fixes the number of possible cpus report for Mac.
authorDavid CARLIER <devnexen@gmail.com>
Fri, 15 Jan 2021 08:09:56 +0000 (08:09 +0000)
committerWilly Tarreau <w@1wt.eu>
Fri, 15 Jan 2021 10:58:46 +0000 (11:58 +0100)
There is no low level api to achieve same as Linux/FreeBSD, we rely
on CPUs available. Without this, the number of threads is just 1 for
Mac while having 8 cores in my M1.

Backporting to 2.1 should be enough if that's possible.

Signed-off-by: David CARLIER <devnexen@gmail.com>
src/thread.c

index 370c0b15da5c4454626d0ca58bdc051fbca583fc..06612e2532bf084c37f71528eff93a5997948c29 100644 (file)
@@ -182,6 +182,8 @@ static int thread_cpus_enabled()
        if (cpuset_getaffinity(CPU_LEVEL_CPUSET, CPU_WHICH_PID, -1,
            sizeof(cpuset), &cpuset) == 0)
                ret = CPU_COUNT(&cpuset);
+#elif defined(__APPLE__)
+       ret = (int)sysconf(_SC_NPROCESSORS_ONLN);
 #endif
 #endif
        ret = MAX(ret, 1);