tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 23:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Only take one work item from the event queue per iteration.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-03-15 09:10:06 +01:00
parent 876519034c
commit 0f9acdffbb
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/base/eventqueue.cpp
View File

@ -78,7 +78,7 @@ void EventQueue::Join(void)
void EventQueue::QueueThreadProc(void) void EventQueue::QueueThreadProc(void)
{ {
for (;;) { for (;;) {
vector<Callback> events; Callback event;
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
@ -89,63 +89,62 @@ void EventQueue::QueueThreadProc(void)
if (m_Events.empty() && m_Stopped) if (m_Events.empty() && m_Stopped)
break; break;
events.swap(m_Events); event = m_Events.top();
m_Events.pop();
} }
BOOST_FOREACH(const Callback& ev, events) {
#ifdef _DEBUG #ifdef _DEBUG
double st = Utility::GetTime(); double st = Utility::GetTime();
# ifdef RUSAGE_THREAD # ifdef RUSAGE_THREAD
struct rusage usage_start, usage_end; struct rusage usage_start, usage_end;
(void) getrusage(RUSAGE_THREAD, &usage_start); (void) getrusage(RUSAGE_THREAD, &usage_start);
# endif /* RUSAGE_THREAD */ # endif /* RUSAGE_THREAD */
#endif /* _DEBUG */ #endif /* _DEBUG */
try { try {
ev(); event();
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
stringstream msgbuf; stringstream msgbuf;
msgbuf << "Exception thrown in event handler: " << std::endl msgbuf << "Exception thrown in event handler: " << std::endl
<< diagnostic_information(ex); << diagnostic_information(ex);
Logger::Write(LogCritical, "base", msgbuf.str()); Logger::Write(LogCritical, "base", msgbuf.str());
} catch (...) { } catch (...) {
Logger::Write(LogCritical, "base", "Exception of unknown type thrown in event handler."); Logger::Write(LogCritical, "base", "Exception of unknown type thrown in event handler.");
} }
#ifdef _DEBUG #ifdef _DEBUG
double et = Utility::GetTime(); double et = Utility::GetTime();
# ifdef RUSAGE_THREAD # ifdef RUSAGE_THREAD
(void) getrusage(RUSAGE_THREAD, &usage_end); (void) getrusage(RUSAGE_THREAD, &usage_end);
double duser = (usage_end.ru_utime.tv_sec - usage_start.ru_utime.tv_sec) + double duser = (usage_end.ru_utime.tv_sec - usage_start.ru_utime.tv_sec) +
(usage_end.ru_utime.tv_usec - usage_start.ru_utime.tv_usec) / 1000000.0; (usage_end.ru_utime.tv_usec - usage_start.ru_utime.tv_usec) / 1000000.0;
double dsys = (usage_end.ru_stime.tv_sec - usage_start.ru_stime.tv_sec) + double dsys = (usage_end.ru_stime.tv_sec - usage_start.ru_stime.tv_sec) +
(usage_end.ru_stime.tv_usec - usage_start.ru_stime.tv_usec) / 1000000.0; (usage_end.ru_stime.tv_usec - usage_start.ru_stime.tv_usec) / 1000000.0;
double dwait = (et - st) - (duser + dsys); double dwait = (et - st) - (duser + dsys);
int dminfaults = usage_end.ru_minflt - usage_start.ru_minflt; int dminfaults = usage_end.ru_minflt - usage_start.ru_minflt;
int dmajfaults = usage_end.ru_majflt - usage_start.ru_majflt; int dmajfaults = usage_end.ru_majflt - usage_start.ru_majflt;
int dvctx = usage_end.ru_nvcsw - usage_start.ru_nvcsw; int dvctx = usage_end.ru_nvcsw - usage_start.ru_nvcsw;
int divctx = usage_end.ru_nivcsw - usage_start.ru_nivcsw; int divctx = usage_end.ru_nivcsw - usage_start.ru_nivcsw;
# endif /* RUSAGE_THREAD */ # endif /* RUSAGE_THREAD */
if (et - st > 0.5) { if (et - st > 0.5) {
stringstream msgbuf; stringstream msgbuf;
# ifdef RUSAGE_THREAD # ifdef RUSAGE_THREAD
msgbuf << "Event call took user:" << duser << "s, system:" << dsys << "s, wait:" << dwait << "s, minor_faults:" << dminfaults << ", major_faults:" << dmajfaults << ", voluntary_csw:" << dvctx << ", involuntary_csw:" << divctx; msgbuf << "Event call took user:" << duser << "s, system:" << dsys << "s, wait:" << dwait << "s, minor_faults:" << dminfaults << ", major_faults:" << dmajfaults << ", voluntary_csw:" << dvctx << ", involuntary_csw:" << divctx;
# else # else
msgbuf << "Event call took " << (et - st) << "s"; msgbuf << "Event call took " << (et - st) << "s";
# endif /* RUSAGE_THREAD */ # endif /* RUSAGE_THREAD */
Logger::Write(LogWarning, "base", msgbuf.str()); Logger::Write(LogWarning, "base", msgbuf.str());
}
#endif /* _DEBUG */
} }
#endif /* _DEBUG */
} }
} }
@ -158,7 +157,7 @@ void EventQueue::QueueThreadProc(void)
void EventQueue::Post(const EventQueue::Callback& callback) void EventQueue::Post(const EventQueue::Callback& callback)
{ {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_Events.push_back(callback); m_Events.push(callback);
m_CV.notify_one(); m_CV.notify_one();
} }

2
lib/base/eventqueue.h
View File

@ -50,7 +50,7 @@ private:
condition_variable m_CV; condition_variable m_CV;
bool m_Stopped; bool m_Stopped;
vector<Callback> m_Events; stack<Callback> m_Events;
void QueueThreadProc(void); void QueueThreadProc(void);
void ReportThreadProc(void); void ReportThreadProc(void);

2
lib/base/i2-base.h
View File

@ -91,6 +91,7 @@
#include <list> #include <list>
#include <algorithm> #include <algorithm>
#include <deque> #include <deque>
#include <stack>
#include <iterator> #include <iterator>
using std::vector; using std::vector;
@ -101,6 +102,7 @@ using std::multimap;
using std::multiset; using std::multiset;
using std::pair; using std::pair;
using std::deque; using std::deque;
using std::stack;
using std::make_pair; using std::make_pair;
using std::stringstream; using std::stringstream;