diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-08-05 16:37:47 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-08-05 16:37:47 +0000 |
| commit | 6a88411f3a2f01c1992e86dc5cfada1d87a7f940 (patch) | |
| tree | d9d44f8ec1e225a6b3fe0f7179284309182ae149 /cpp | |
| parent | bb00b9a94379b7ba6305b2bf85e7edce5f795d50 (diff) | |
| download | qpid-python-6a88411f3a2f01c1992e86dc5cfada1d87a7f940.tar.gz | |
Improved Timer delay/overrun warnings
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@801290 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/sys/Timer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp index 5ed117db93..08c6b6bd9f 100644 --- a/cpp/src/qpid/sys/Timer.cpp +++ b/cpp/src/qpid/sys/Timer.cpp @@ -99,12 +99,12 @@ void Timer::run() // warn on extreme lateness AbsTime start(AbsTime::now()); Duration late(t->sortTime, start); - if (late > 500 * TIME_MSEC) { - QPID_LOG(warning, "Timer delayed by " << late / TIME_MSEC << "ms"); - } { ScopedLock<Mutex> l(t->callbackLock); if (t->cancelled) { + if (late > 500 * TIME_MSEC) { + QPID_LOG(debug, "cancelled Timer woken up late by " << late / TIME_MSEC << "ms"); + } continue; } else if(Duration(t->nextFireTime, start) >= 0) { Monitor::ScopedUnlock u(monitor); @@ -112,7 +112,9 @@ void Timer::run() // Warn on callback overrun AbsTime end(AbsTime::now()); Duration overrun(tasks.top()->nextFireTime, end); - if (overrun > 1 * TIME_MSEC) { + if (late > 1 * TIME_MSEC) { + QPID_LOG(warning, "Timer woken up late by " << late / TIME_MSEC << "ms"); + } else if (overrun > 1 * TIME_MSEC) { QPID_LOG(warning, "Timer callback overran by " << overrun / TIME_MSEC << "ms [taking " << Duration(start, end) << "]"); |