From 0a52f498ae4e8fa3ec896acdb6ee6a2dbd34ecd7 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Thu, 25 Mar 2010 13:21:30 +0000
Subject: More generous overrun threshold for cluster timer to avoid excessive
 warnings.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@927383 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/qpid/sys/Timer.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'cpp/src/qpid/sys/Timer.cpp')

diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp
index fcd58b187f..ffd1921b46 100644
--- a/cpp/src/qpid/sys/Timer.cpp
+++ b/cpp/src/qpid/sys/Timer.cpp
@@ -76,7 +76,10 @@ void TimerTask::cancel() {
 }
 
 Timer::Timer() :
-    active(false) 
+    active(false),
+    late(50 * TIME_MSEC),
+    overran(2 * TIME_MSEC),
+    lateCancel(500 * TIME_MSEC)
 {
     start();
 }
@@ -105,7 +108,7 @@ void Timer::run()
             ScopedLock<Mutex> l(t->callbackLock);
             if (t->cancelled) {
                 drop(t);
-                if (delay > 500 * TIME_MSEC) {
+                if (delay > lateCancel) {
                     QPID_LOG(debug, "cancelled Timer woken up " << delay / TIME_MSEC
                              << "ms late");
                 }
@@ -116,20 +119,19 @@ void Timer::run()
                 // Warn on callback overrun
                 AbsTime end(AbsTime::now());
                 Duration overrun(tasks.top()->nextFireTime, end);
-                bool late = delay > 50 * TIME_MSEC;
-                bool overran = overrun > 2 * TIME_MSEC;
-                if (late)
-                if (overran) {
+                if (delay > late) {
+                    if (overrun > overran) {
+                        QPID_LOG(warning,
+                                 "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 << "ms late");
+                    }
+                } else if (overrun > overran) {
                     QPID_LOG(warning,
-                        "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 << "ms late");
-                } else if (overran) {
-                    QPID_LOG(warning,
-                        "Timer callback overran by " << overrun / TIME_MSEC << "ms [taking "
-                        << Duration(start, end) << "]");
+                             "Timer callback overran by " << overrun / TIME_MSEC <<
+                             "ms [taking " << Duration(start, end) << "]");
                 }
                 continue;
             } else {
-- 
cgit v1.2.1