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

Fix ThreadPool exception on shutdown. 

Fixes #3891
This commit is contained in:
Gunnar Beutner 2013-05-13 09:58:24 +02:00
parent 36a45059f9
commit f4d04f8172
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/base/threadpool.cpp
View File

@ -197,13 +197,14 @@ void ThreadPool::QueueThreadProc(int tid)
* Appends a work item to the work queue. Work items will be processed in FIFO order. * Appends a work item to the work queue. Work items will be processed in FIFO order.
* *
* @param callback The callback function for the work item. * @param callback The callback function for the work item.
* @returns true if the item was queued, false otherwise.
*/ */
void ThreadPool::Post(const ThreadPool::WorkFunction& callback) bool ThreadPool::Post(const ThreadPool::WorkFunction& callback)
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
if (m_Stopped) if (m_Stopped)
BOOST_THROW_EXCEPTION(std::runtime_error("ThreadPool has been stopped.")); return false;
WorkItem wi; WorkItem wi;
wi.Callback = callback; wi.Callback = callback;
@ -211,6 +212,8 @@ void ThreadPool::Post(const ThreadPool::WorkFunction& callback)
m_WorkItems.push_back(wi); m_WorkItems.push_back(wi);
m_WorkCV.notify_one(); m_WorkCV.notify_one();
return true;
} }
void ThreadPool::ManagerThreadProc(void) void ThreadPool::ManagerThreadProc(void)

2
lib/base/threadpool.h
View File

@ -46,7 +46,7 @@ public:
void Stop(void); void Stop(void);
void Join(void); void Join(void);
void Post(const WorkFunction& callback); bool Post(const WorkFunction& callback);
private: private:
enum ThreadState enum ThreadState