mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8770 from alalek:fix_pthreads_default

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-05-22 22:18:26 +00:00
commit 17b89b2a35
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/core/src/parallel_pthreads.cpp
View File

@ -206,7 +206,6 @@ private:
pthread_mutex_t m_manager_access_mutex; pthread_mutex_t m_manager_access_mutex;
static const char m_env_name[]; static const char m_env_name[];
static const unsigned int m_default_number_of_threads;
work_load m_work_load; work_load m_work_load;
@ -223,14 +222,6 @@ private:
const char ThreadManager::m_env_name[] = "OPENCV_FOR_THREADS_NUM"; const char ThreadManager::m_env_name[] = "OPENCV_FOR_THREADS_NUM";
#ifdef ANDROID
// many modern phones/tables have 4-core CPUs. Let's use no more
// than 2 threads by default not to overheat the devices
const unsigned int ThreadManager::m_default_number_of_threads = 2;
#else
const unsigned int ThreadManager::m_default_number_of_threads = 8;
#endif
ForThread::~ForThread() ForThread::~ForThread()
{ {
if(m_state == eFTStarted) if(m_state == eFTStarted)
@ -534,7 +525,15 @@ void ThreadManager::setNumOfThreads(size_t n)
size_t ThreadManager::defaultNumberOfThreads() size_t ThreadManager::defaultNumberOfThreads()
{ {
unsigned int result = m_default_number_of_threads; #ifdef ANDROID
// many modern phones/tables have 4-core CPUs. Let's use no more
// than 2 threads by default not to overheat the devices
const unsigned int default_number_of_threads = 2;
#else
const unsigned int default_number_of_threads = (unsigned int)std::max(1, cv::getNumberOfCPUs());
#endif
unsigned int result = default_number_of_threads;
char * env = getenv(m_env_name); char * env = getenv(m_env_name);