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

Fix WorkQueue lock contention. 

Fixes #5245
This commit is contained in:
Gunnar Beutner 2013-11-29 17:07:04 +01:00 committed by Gunnar Beutner
parent 9f7e5b1845
commit 1c0f9fe9ac
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/base/workqueue.cpp
View File

@ -30,10 +30,14 @@ int WorkQueue::m_NextID = 1;
WorkQueue::WorkQueue(size_t maxItems) WorkQueue::WorkQueue(size_t maxItems)
: m_ID(m_NextID++), m_MaxItems(maxItems), m_Joined(false), : m_ID(m_NextID++), m_MaxItems(maxItems), m_Joined(false),
m_Stopped(false), m_ExceptionCallback(WorkQueue::DefaultExceptionCallback), m_Stopped(false), m_ExceptionCallback(WorkQueue::DefaultExceptionCallback)
m_LastStatus(0)
{ {
m_Thread = boost::thread(boost::bind(&WorkQueue::WorkerThreadProc, this)); m_Thread = boost::thread(boost::bind(&WorkQueue::WorkerThreadProc, this));
m_StatusTimer = make_shared<Timer>();
m_StatusTimer->SetInterval(10);
m_StatusTimer->OnTimerExpired.connect(boost::bind(&WorkQueue::StatusTimerHandler, this));
m_StatusTimer->Start();
} }
WorkQueue::~WorkQueue(void) WorkQueue::~WorkQueue(void)
@ -49,37 +53,37 @@ WorkQueue::~WorkQueue(void)
*/ */
void WorkQueue::Enqueue(const WorkCallback& callback, bool allowInterleaved) void WorkQueue::Enqueue(const WorkCallback& callback, bool allowInterleaved)
{ {
WorkItem item;
item.Callback = callback;
item.AllowInterleaved = allowInterleaved;
bool wq_thread = (boost::this_thread::get_id() == GetThreadId());
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
ASSERT(!m_Stopped); ASSERT(!m_Stopped);
bool wq_thread = (boost::this_thread::get_id() == GetThreadId());
if (!wq_thread) { if (!wq_thread) {
while (m_Items.size() >= m_MaxItems) while (m_Items.size() >= m_MaxItems)
m_CV.wait(lock); m_CVFull.wait(lock);
} }
WorkItem item;
item.Callback = callback;
item.AllowInterleaved = allowInterleaved;
m_Items.push_back(item); m_Items.push_back(item);
if (wq_thread) if (wq_thread)
ProcessItems(lock, true); ProcessItems(lock, true);
else else
m_CV.notify_all(); m_CVEmpty.notify_one();
} }
void WorkQueue::Join(void) void WorkQueue::Join(void)
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_Joined = true; m_Joined = true;
m_CV.notify_all(); m_CVEmpty.notify_all();
while (!m_Stopped) while (!m_Stopped)
m_CV.wait(lock); m_CVFull.wait(lock);
} }
boost::thread::id WorkQueue::GetThreadId(void) const boost::thread::id WorkQueue::GetThreadId(void) const
@ -99,26 +103,27 @@ void WorkQueue::DefaultExceptionCallback(boost::exception_ptr exp)
throw; throw;
} }
void WorkQueue::StatusTimerHandler(void)
{
boost::mutex::scoped_lock lock(m_Mutex);
Log(LogInformation, "base", "WQ #" + Convert::ToString(m_ID) + " items: " + Convert::ToString(m_Items.size()));
}
void WorkQueue::ProcessItems(boost::mutex::scoped_lock& lock, bool interleaved) void WorkQueue::ProcessItems(boost::mutex::scoped_lock& lock, bool interleaved)
{ {
while (!m_Items.empty()) { while (!m_Items.empty()) {
WorkItem wi = m_Items.front();
if (interleaved && !wi.AllowInterleaved)
return;
m_Items.pop_front();
m_CVFull.notify_all();
lock.unlock();
try { try {
WorkItem wi = m_Items.front();
if (interleaved && !wi.AllowInterleaved)
return;
m_Items.pop_front();
m_CV.notify_all();
double now = Utility::GetTime();
if (m_LastStatus + 10 < now) {
Log(LogInformation, "base", "WQ items: " + Convert::ToString(m_Items.size()));
m_LastStatus = now;
}
lock.unlock();
wi.Callback(); wi.Callback();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
lock.lock(); lock.lock();
@ -144,7 +149,7 @@ void WorkQueue::WorkerThreadProc(void)
for (;;) { for (;;) {
while (m_Items.empty() && !m_Joined) while (m_Items.empty() && !m_Joined)
m_CV.wait(lock); m_CVEmpty.wait(lock);
if (m_Joined) if (m_Joined)
break; break;
@ -153,5 +158,5 @@ void WorkQueue::WorkerThreadProc(void)
} }
m_Stopped = true; m_Stopped = true;
m_CV.notify_all(); m_CVFull.notify_all();
} }

9
lib/base/workqueue.h
View File

@ -21,6 +21,7 @@
#define WORKQUEUE_H #define WORKQUEUE_H
#include "base/i2-base.h" #include "base/i2-base.h"
#include "base/timer.h"
#include <deque> #include <deque>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
@ -50,7 +51,7 @@ class I2_BASE_API WorkQueue
public: public:
typedef boost::function<void (boost::exception_ptr)> ExceptionCallback; typedef boost::function<void (boost::exception_ptr)> ExceptionCallback;
WorkQueue(size_t maxItems = 2500000); WorkQueue(size_t maxItems = 25000);
~WorkQueue(void); ~WorkQueue(void);
void Enqueue(const WorkCallback& callback, bool allowInterleaved = false); void Enqueue(const WorkCallback& callback, bool allowInterleaved = false);
@ -65,17 +66,19 @@ private:
static int m_NextID; static int m_NextID;
boost::mutex m_Mutex; boost::mutex m_Mutex;
boost::condition_variable m_CV; boost::condition_variable m_CVEmpty;
boost::condition_variable m_CVFull;
boost::thread m_Thread; boost::thread m_Thread;
size_t m_MaxItems; size_t m_MaxItems;
bool m_Joined; bool m_Joined;
bool m_Stopped; bool m_Stopped;
std::deque<WorkItem> m_Items; std::deque<WorkItem> m_Items;
ExceptionCallback m_ExceptionCallback; ExceptionCallback m_ExceptionCallback;
double m_LastStatus; Timer::Ptr m_StatusTimer;
void ProcessItems(boost::mutex::scoped_lock& lock, bool interleaved); void ProcessItems(boost::mutex::scoped_lock& lock, bool interleaved);
void WorkerThreadProc(void); void WorkerThreadProc(void);
void StatusTimerHandler(void);
static void DefaultExceptionCallback(boost::exception_ptr exp); static void DefaultExceptionCallback(boost::exception_ptr exp);
}; };