diff options
author | Alan Conway <aconway@apache.org> | 2011-03-18 16:13:28 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2011-03-18 16:13:28 +0000 |
commit | d71edeb094f02ab529764afdca6f1507b5c567d3 (patch) | |
tree | 9b26017f4ff19eeca5537aecec45696e1212663e | |
parent | 405e819f3fd696b57b589d70be79ab6011a49baa (diff) | |
download | qpid-python-d71edeb094f02ab529764afdca6f1507b5c567d3.tar.gz |
Revert "NO-JIRA: Fix qpidd late/overran warnings."
This reverts commit r1082552
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.10@1082962 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/sys/Timer.cpp | 10 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/sys/TimerWarnings.cpp | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/qpid/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp index 85e410860d..a97ccd1bd1 100644 --- a/qpid/cpp/src/qpid/sys/Timer.cpp +++ b/qpid/cpp/src/qpid/sys/Timer.cpp @@ -131,14 +131,12 @@ void Timer::run() bool warningsEnabled; QPID_LOG_TEST(warning, warningsEnabled); if (warningsEnabled) { - if (overrun > overran) { - if (delay > overran) // if delay is significant to an overrun. - warn.lateAndOverran(t->name, delay, overrun, Duration(start, end)); - else - warn.overran(t->name, overrun, Duration(start, end)); - } + if (delay > late && overrun > overran) + warn.lateAndOverran(t->name, delay, overrun, Duration(start, end)); else if (delay > late) warn.late(t->name, delay); + else if (overrun > overran) + warn.overran(t->name, overrun, Duration(start, end)); } continue; } else { diff --git a/qpid/cpp/src/qpid/sys/TimerWarnings.cpp b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp index 87c3169456..48a56eb472 100644 --- a/qpid/cpp/src/qpid/sys/TimerWarnings.cpp +++ b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp @@ -59,19 +59,17 @@ void TimerWarnings::log() { QPID_LOG(warning, task << " task late " << stats.lateDelay.count << " times by " << stats.lateDelay.average()/TIME_MSEC << "ms on average."); - if (stats.overranOverrun.count) QPID_LOG(warning, task << " task overran " << stats.overranOverrun.count << " times by " << stats.overranOverrun.average()/TIME_MSEC << "ms (taking " << stats.overranTime.average() << "ns) on average."); - if (stats.lateAndOverranOverrun.count) - QPID_LOG(warning, task << " task late and overran " - << stats.lateAndOverranOverrun.count << " times: late " - << stats.lateAndOverranDelay.average()/TIME_MSEC << "ms, overran " - << stats.lateAndOverranOverrun.average()/TIME_MSEC << "ms (taking " - << stats.lateAndOverranTime.average() << "ns) on average."); + if (stats.lateAndOverranDelay.count) + QPID_LOG(warning, task << " task overran " + << stats.overranOverrun.count << " times by " + << stats.overranOverrun.average()/TIME_MSEC << "ms (taking " + << stats.overranTime.average() << "ns) on average."); } nextReport = AbsTime(now(), interval); |