tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 22:54:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-introduce Timer::Initialize()

Browse Source 
refs #6445
This commit is contained in:
Alexander A. Klimov 2018-07-19 12:49:27 +02:00 committed by Michael Friedrich
parent 75947c96d5
commit d15e1006f3
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base/application.cpp
View File

@ -140,6 +140,8 @@ void Application::InitializeBase()
/* make sure the thread pool gets initialized */ /* make sure the thread pool gets initialized */
GetTP().Start(); GetTP().Start();
Timer::Initialize();
} }
void Application::UninitializeBase() void Application::UninitializeBase()

25
lib/base/timer.cpp
View File

@ -71,7 +71,6 @@ static boost::condition_variable l_TimerCV;
static std::thread l_TimerThread; static std::thread l_TimerThread;
static bool l_StopTimerThread; static bool l_StopTimerThread;
static TimerSet l_Timers; static TimerSet l_Timers;
static int l_AliveTimers;
/** /**
* Destructor for the Timer class. * Destructor for the Timer class.
@ -81,6 +80,13 @@ Timer::~Timer()
Stop(true); Stop(true);
} }
void Timer::Initialize()
{
boost::mutex::scoped_lock lock(l_TimerMutex);
l_StopTimerThread = false;
l_TimerThread = std::thread(&Timer::TimerThreadProc);
}
void Timer::Uninitialize() void Timer::Uninitialize()
{ {
{ {
@ -139,11 +145,6 @@ void Timer::Start()
{ {
boost::mutex::scoped_lock lock(l_TimerMutex); boost::mutex::scoped_lock lock(l_TimerMutex);
m_Started = true; m_Started = true;
if (l_AliveTimers++ == 0) {
l_StopTimerThread = false;
l_TimerThread = std::thread(&Timer::TimerThreadProc);
}
} }
InternalReschedule(false); InternalReschedule(false);
@ -159,18 +160,6 @@ void Timer::Stop(bool wait)
boost::mutex::scoped_lock lock(l_TimerMutex); boost::mutex::scoped_lock lock(l_TimerMutex);
if (m_Started && --l_AliveTimers == 0) {
l_StopTimerThread = true;
l_TimerCV.notify_all();
lock.unlock();
if (l_TimerThread.joinable() && l_TimerThread.get_id() != std::this_thread::get_id())
l_TimerThread.join();
lock.lock();
}
m_Started = false; m_Started = false;
l_Timers.erase(this); l_Timers.erase(this);

1
lib/base/timer.hpp
View File

@ -40,6 +40,7 @@ public:
~Timer() override; ~Timer() override;
static void Initialize();
static void Uninitialize(); static void Uninitialize();
void SetInterval(double interval); void SetInterval(double interval);