diff options
Diffstat (limited to 'cpp/src/qpid/sys')
| -rw-r--r-- | cpp/src/qpid/sys/Timer.cpp | 16 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/Timer.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp index 26d16e5188..3b627687de 100644 --- a/cpp/src/qpid/sys/Timer.cpp +++ b/cpp/src/qpid/sys/Timer.cpp @@ -63,7 +63,7 @@ void TimerTask::setupNextFire() { nextFireTime = max(AbsTime::now(), AbsTime(nextFireTime, period)); cancelled = false; } else { - QPID_LOG(error, "Couldn't setup next timer firing: " << Duration(nextFireTime, AbsTime::now()) << "[" << period << "]"); + QPID_LOG(error, name << " couldn't setup next timer firing: " << Duration(nextFireTime, AbsTime::now()) << "[" << period << "]"); } } @@ -109,7 +109,7 @@ void Timer::run() if (t->cancelled) { drop(t); if (delay > lateCancel) { - QPID_LOG(debug, "cancelled Timer woken up " << delay / TIME_MSEC + QPID_LOG(debug, t->name << " cancelled timer woken up " << delay / TIME_MSEC << "ms late"); } continue; @@ -126,19 +126,19 @@ void Timer::run() } if (delay > late) { if (overrun > overran) { - QPID_LOG(warning, - "Timer woken up " << delay / TIME_MSEC << + QPID_LOG(warning, t->name << + " timer woken up " << delay / TIME_MSEC << "ms late, overrunning by " << overrun / TIME_MSEC << "ms [taking " << Duration(start, end) << "]"); } else { - QPID_LOG(warning, - "Timer woken up " << delay / TIME_MSEC << + QPID_LOG(warning, t->name << + " timer woken up " << delay / TIME_MSEC << "ms late"); } } else if (overrun > overran) { - QPID_LOG(warning, - "Timer callback overran by " << + QPID_LOG(warning,t->name << + " timer callback overran by " << overrun / TIME_MSEC << "ms [taking " << Duration(start, end) << "]"); } diff --git a/cpp/src/qpid/sys/Timer.h b/cpp/src/qpid/sys/Timer.h index 1e0599e347..531bae0f52 100644 --- a/cpp/src/qpid/sys/Timer.h +++ b/cpp/src/qpid/sys/Timer.h @@ -53,8 +53,8 @@ class TimerTask : public RefCounted { void fireTask(); public: - QPID_COMMON_EXTERN TimerTask(Duration period, const std::string& name=std::string()); - QPID_COMMON_EXTERN TimerTask(AbsTime fireTime, const std::string& name=std::string()); + QPID_COMMON_EXTERN TimerTask(Duration period, const std::string& name); + QPID_COMMON_EXTERN TimerTask(AbsTime fireTime, const std::string& name); QPID_COMMON_EXTERN virtual ~TimerTask(); QPID_COMMON_EXTERN void setupNextFire(); |