diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2015-03-08 07:14:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-10 22:13:28 (GMT) |
| commit | a25b5a32c76630f2433b860fef7bc28a9380a8f6 (patch) | |
| tree | 98834d20fde1ef9e6b4a84ace375411bf71d9eec /thread-utils.c | |
| parent | 9529080de253b89474402f323e10470656764b3a (diff) | |
| download | git-a25b5a32c76630f2433b860fef7bc28a9380a8f6.zip git-a25b5a32c76630f2433b860fef7bc28a9380a8f6.tar.gz git-a25b5a32c76630f2433b860fef7bc28a9380a8f6.tar.bz2 | |
thread-utils.c: detect CPU count on older BSD-like systems
Not all systems support using sysconf to detect the number
of available CPU cores. Older BSD and BSD-derived systems
only provide the information via the sysctl function.
If HAVE_BSD_SYSCTL is defined attempt to retrieve the number
of available CPU cores using the sysctl function.
If HAVE_BSD_SYSCTL is not defined or the sysctl function
fails, we still attempt to get the information via sysconf.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'thread-utils.c')
| -rw-r--r-- | thread-utils.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/thread-utils.c b/thread-utils.c index 97396a7..a2135e0 100644 --- a/thread-utils.c +++ b/thread-utils.c @@ -35,7 +35,23 @@ int online_cpus(void) if (!pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0)) return (int)psd.psd_proc_cnt; -#endif +#elif defined(HAVE_BSD_SYSCTL) && defined(HW_NCPU) + int mib[2]; + size_t len; + int cpucount; + + mib[0] = CTL_HW; +# ifdef HW_AVAILCPU + mib[1] = HW_AVAILCPU; + len = sizeof(cpucount); + if (!sysctl(mib, 2, &cpucount, &len, NULL, 0)) + return cpucount; +# endif /* HW_AVAILCPU */ + mib[1] = HW_NCPU; + len = sizeof(cpucount); + if (!sysctl(mib, 2, &cpucount, &len, NULL, 0)) + return cpucount; +#endif /* defined(HAVE_BSD_SYSCTL) && defined(HW_NCPU) */ #ifdef _SC_NPROCESSORS_ONLN if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0) |