boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Restore POSIX & Linux core count.

Browse Source 
Looks like the std core count function is no worse than the POSIX &
Linux specific methods. Re-enabling those platform methods.
This commit is contained in:
Rene Rivera
2019-06-18 08:09:48 -05:00
parent 9e4bb2e28b
commit 79c248c57a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/engine/sysinfo.cpp
View File

@@ -60,11 +60,11 @@ namespace
unsigned int sched_affinity_cpu_count()
{
#if defined(CPU_COUNT_S)
#if defined(CPU_COUNT)
::cpu_set_t cpu_set;
if (::sched_getaffinity(0, sizeof(cpu_set_t), &cpu_set) == 0)
{
return CPU_COUNT_S(sizeof(cpu_set_t), &cpu_set);
return CPU_COUNT(sizeof(cpu_set_t), &cpu_set);
}
#endif
return 0;
@@ -100,10 +100,10 @@ unsigned int b2::system_info::cpu_core_count()
{
cpu_thread_count_ = macosx_physicalcpu();
}
// if (cpu_thread_count_ == 0)
// {
// cpu_thread_count_ = sysconf_nprocs_configured();
// }
if (cpu_thread_count_ == 0)
{
cpu_thread_count_ = sysconf_nprocs_configured();
}
if (cpu_core_count_ <= 0)
{
cpu_core_count_ = 1;
@@ -117,14 +117,14 @@ unsigned int b2::system_info::cpu_thread_count()
{
cpu_thread_count_ = macosx_logicalcpu();
}
// if (cpu_thread_count_ == 0)
// {
// cpu_thread_count_ = sched_affinity_cpu_count();
// }
// if (cpu_thread_count_ == 0)
// {
// cpu_thread_count_ = sysconf_nprocs_online();
// }
if (cpu_thread_count_ == 0)
{
cpu_thread_count_ = sched_affinity_cpu_count();
}
if (cpu_thread_count_ == 0)
{
cpu_thread_count_ = sysconf_nprocs_online();
}
if (cpu_thread_count_ == 0)
{
cpu_thread_count_ = std_thread_hardware_concurrency();