Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2257 from mtheall/master

Browse Source 
Return at least 1 from btGetNumHardwareThreads
This commit is contained in:
erwincoumans
2019-05-27 14:01:43 -07:00
committed by GitHub
parent 26486d56d7 c3790448bc
commit 78e1baede8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp
View File

@@ -45,14 +45,14 @@ subject to the following restrictions:
int btGetNumHardwareThreads() int btGetNumHardwareThreads()
{ {
return btMin<int>(BT_MAX_THREAD_COUNT, std::thread::hardware_concurrency()); return btMax(1u, btMin(BT_MAX_THREAD_COUNT, std::thread::hardware_concurrency()));
} }
#else #else
int btGetNumHardwareThreads() int btGetNumHardwareThreads()
{ {
return btMin<int>(BT_MAX_THREAD_COUNT, sysconf(_SC_NPROCESSORS_ONLN)); return btMax(1, btMin<int>(BT_MAX_THREAD_COUNT, sysconf(_SC_NPROCESSORS_ONLN)));
} }
#endif #endif