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

Ensure that the main thread pool gets re-initialized properly after fork() 

refs #10410
This commit is contained in:
Gunnar Beutner 2015-10-21 07:02:49 +02:00
parent 3c6f0e31d9
commit e93dd3cf15
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/application.cpp
View File

@ -144,7 +144,7 @@ void Application::InitializeBase(void)
Loader::ExecuteDeferredInitializers(); Loader::ExecuteDeferredInitializers();
/* make sure the thread pool gets initialized */ /* make sure the thread pool gets initialized */
GetTP(); GetTP().Start();
Timer::Initialize(); Timer::Initialize();
} }

12
lib/base/threadpool.cpp
View File

@ -31,7 +31,7 @@ using namespace icinga;
int ThreadPool::m_NextID = 1; int ThreadPool::m_NextID = 1;
ThreadPool::ThreadPool(size_t max_threads) ThreadPool::ThreadPool(size_t max_threads)
: m_ID(m_NextID++), m_MaxThreads(max_threads), m_Stopped(false) : m_ID(m_NextID++), m_MaxThreads(max_threads), m_Stopped(true)
{ {
if (m_MaxThreads != UINT_MAX && m_MaxThreads < sizeof(m_Queues) / sizeof(m_Queues[0])) if (m_MaxThreads != UINT_MAX && m_MaxThreads < sizeof(m_Queues) / sizeof(m_Queues[0]))
m_MaxThreads = sizeof(m_Queues) / sizeof(m_Queues[0]); m_MaxThreads = sizeof(m_Queues) / sizeof(m_Queues[0]);
@ -46,6 +46,11 @@ ThreadPool::~ThreadPool(void)
void ThreadPool::Start(void) void ThreadPool::Start(void)
{ {
if (!m_Stopped)
return;
m_Stopped = false;
for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++)
m_Queues[i].SpawnWorker(m_ThreadGroup); m_Queues[i].SpawnWorker(m_ThreadGroup);
@ -54,6 +59,9 @@ void ThreadPool::Start(void)
void ThreadPool::Stop(void) void ThreadPool::Stop(void)
{ {
if (m_Stopped)
return;
{ {
boost::mutex::scoped_lock lock(m_MgmtMutex); boost::mutex::scoped_lock lock(m_MgmtMutex);
m_Stopped = true; m_Stopped = true;
@ -76,7 +84,7 @@ void ThreadPool::Stop(void)
for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++) for (size_t i = 0; i < sizeof(m_Queues) / sizeof(m_Queues[0]); i++)
m_Queues[i].Stopped = false; m_Queues[i].Stopped = false;
m_Stopped = false; m_Stopped = true;
} }
/** /**