summaryrefslogtreecommitdiff
path: root/src/components/utils/src/timer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/utils/src/timer.cc')
-rw-r--r--src/components/utils/src/timer.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc
index b58ddf2d66..ceade03afb 100644
--- a/src/components/utils/src/timer.cc
+++ b/src/components/utils/src/timer.cc
@@ -41,7 +41,7 @@
#include "utils/threads/thread_delegate.h"
#include "utils/timer_task.h"
-CREATE_LOGGERPTR_GLOBAL(logger_, "Utils")
+SDL_CREATE_LOG_VARIABLE("Utils")
timer::Timer::Timer(const std::string& name, TimerTask* task)
: name_(name)
@@ -51,15 +51,15 @@ timer::Timer::Timer(const std::string& name, TimerTask* task)
, thread_(threads::CreateThread(name_.c_str(), delegate_.get()))
, single_shot_(true)
, completed_flag_(false) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
DCHECK(!name_.empty());
DCHECK(task_);
DCHECK(thread_);
- LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been created");
+ SDL_LOG_DEBUG("Timer " << name_ << " has been created");
}
timer::Timer::~Timer() {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
sync_primitives::AutoLock auto_lock(state_lock_);
StopThread();
StopDelegate();
@@ -69,12 +69,12 @@ timer::Timer::~Timer() {
DeleteThread(thread_);
DCHECK(task_);
delete task_;
- LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been destroyed");
+ SDL_LOG_DEBUG("Timer " << name_ << " has been destroyed");
}
void timer::Timer::Start(const Milliseconds timeout,
const TimerType timer_type) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
sync_primitives::AutoLock auto_lock(state_lock_);
StopThread();
completed_flag_ = false;
@@ -91,16 +91,16 @@ void timer::Timer::Start(const Milliseconds timeout,
};
StartDelegate(timeout);
StartThread();
- LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been started");
+ SDL_LOG_DEBUG("Timer " << name_ << " has been started");
}
void timer::Timer::Stop() {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
sync_primitives::AutoLock auto_lock(state_lock_);
StopThread();
StopDelegate();
single_shot_ = true;
- LOG4CXX_DEBUG(logger_, "Timer " << name_ << " has been stopped");
+ SDL_LOG_DEBUG("Timer " << name_ << " has been stopped");
}
bool timer::Timer::is_running() const {
@@ -206,17 +206,16 @@ bool timer::Timer::TimerDelegate::finalized_flag() const {
void timer::Timer::TimerDelegate::threadMain() {
sync_primitives::AutoLock auto_lock(state_lock_ref_);
while (!stop_flag_ && !finalized_flag_) {
- LOG4CXX_DEBUG(logger_, "Milliseconds left to wait: " << timeout_);
+ SDL_LOG_DEBUG("Milliseconds left to wait: " << timeout_);
if (sync_primitives::ConditionalVariable::kTimeout ==
state_condition_.WaitFor(auto_lock, timeout_)) {
- LOG4CXX_DEBUG(logger_,
- "Timer has finished counting. Timeout (ms): " << timeout_);
+ SDL_LOG_DEBUG("Timer has finished counting. Timeout (ms): " << timeout_);
if (timer_) {
sync_primitives::AutoUnlock auto_unlock(auto_lock);
timer_->OnTimeout();
}
} else {
- LOG4CXX_DEBUG(logger_, "Timer has been force reset");
+ SDL_LOG_DEBUG("Timer has been force reset");
}
}
}