tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/threadpool-join-4986' into next 

Fixes #4986
This commit is contained in:
Gunnar Beutner 2013-10-31 19:12:21 +01:00
parent 060e772ce3 6abf16e6ed
commit 7d501e0a20
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/threadpool.cpp
View File

@ -236,7 +236,8 @@ void ThreadPool::ManagerThreadProc(void)
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_MgmtCV.timed_wait(lock, boost::posix_time::seconds(5)); if (!m_Stopped)
m_MgmtCV.timed_wait(lock, boost::posix_time::seconds(5));
if (m_Stopped) if (m_Stopped)
break; break;
@ -345,7 +346,8 @@ void ThreadPool::StatsThreadProc(void)
for (;;) { for (;;) {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_MgmtCV.timed_wait(lock, boost::posix_time::milliseconds(250)); if (!m_Stopped)
m_MgmtCV.timed_wait(lock, boost::posix_time::milliseconds(250));
if (m_Stopped) if (m_Stopped)
break; break;