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

Made Timer::Timers private.

This commit is contained in:
Gunnar Beutner 2012-07-13 15:03:24 +02:00
parent abb5780f4a
commit 3c972b9793
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
base/timer.cpp
View File

@ -21,7 +21,7 @@
using namespace icinga;
Timer::CollectionType Timer::Timers;
Timer::CollectionType Timer::m_Timers;
/**
* Constructor for the Timer class.
@ -44,14 +44,14 @@ long Timer::ProcessTimers(void)
time(&st);
Timer::CollectionType::iterator prev, i;
for (i = Timers.begin(); i != Timers.end(); ) {
for (i = m_Timers.begin(); i != m_Timers.end(); ) {
Timer::Ptr timer = i->lock();
prev = i;
i++;
if (!timer) {
Timers.erase(prev);
m_Timers.erase(prev);
continue;
}
@ -140,7 +140,7 @@ void Timer::Start(void)
Stop();
Timers.push_back(GetSelf());
m_Timers.push_back(GetSelf());
Reschedule(time(NULL) + m_Interval);
}
@ -152,7 +152,7 @@ void Timer::Stop(void)
{
assert(Application::IsMainThread());
Timers.remove_if(WeakPtrEqual<Timer>(this));
m_Timers.remove_if(WeakPtrEqual<Timer>(this));
}
/**

4
base/timer.h
View File

@ -37,8 +37,6 @@ public:
typedef list<Timer::WeakPtr> CollectionType;
static Timer::CollectionType Timers;
Timer(void);
void SetInterval(long interval);
@ -57,6 +55,8 @@ private:
long m_Interval; /**< The interval of the timer. */
time_t m_Next; /**< When the next event should happen. */
static Timer::CollectionType m_Timers;
void Call(void);
};