diff options
author | Alan Conway <aconway@apache.org> | 2010-08-26 21:12:54 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2010-08-26 21:12:54 +0000 |
commit | f32145824299cc519690c700bd5ea8117d4c675b (patch) | |
tree | cf883fe9c82498246e352ecb3a18942429d66083 | |
parent | 9c5d0cf2197a7d8901d3cc2793eb630f17d0d3ee (diff) | |
download | qpid-python-f32145824299cc519690c700bd5ea8117d4c675b.tar.gz |
Give timer tasks a name for logging purposes.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@989925 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | cpp/src/qpid/broker/Connection.cpp | 4 | ||||
-rw-r--r-- | cpp/src/qpid/broker/DtxManager.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/broker/DtxTimeout.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/broker/LinkRegistry.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/broker/QueueCleaner.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/broker/SessionState.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/client/ConnectionImpl.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/cluster/ExpiryPolicy.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/cluster/WatchDogPlugin.cpp | 2 | ||||
-rw-r--r-- | cpp/src/qpid/sys/Timer.cpp | 16 | ||||
-rw-r--r-- | cpp/src/qpid/sys/Timer.h | 4 | ||||
-rw-r--r-- | cpp/src/tests/TimerTest.cpp | 2 |
12 files changed, 21 insertions, 21 deletions
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index 1e4d58032a..33ed032327 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -59,7 +59,7 @@ struct ConnectionTimeoutTask : public sys::TimerTask { Connection& connection; ConnectionTimeoutTask(uint16_t hb, sys::Timer& t, Connection& c) : - TimerTask(Duration(hb*2*TIME_SEC)), + TimerTask(Duration(hb*2*TIME_SEC),"ConnectionTimeout"), timer(t), connection(c) {} @@ -365,7 +365,7 @@ struct ConnectionHeartbeatTask : public sys::TimerTask { sys::Timer& timer; Connection& connection; ConnectionHeartbeatTask(uint16_t hb, sys::Timer& t, Connection& c) : - TimerTask(Duration(hb*TIME_SEC)), + TimerTask(Duration(hb*TIME_SEC), "ConnectionHeartbeat"), timer(t), connection(c) {} diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp index a2ab20ec44..3caa41c3f4 100644 --- a/cpp/src/qpid/broker/DtxManager.cpp +++ b/cpp/src/qpid/broker/DtxManager.cpp @@ -154,7 +154,7 @@ void DtxManager::timedout(const std::string& xid) } DtxManager::DtxCleanup::DtxCleanup(uint32_t _timeout, DtxManager& _mgr, const std::string& _xid) - : TimerTask(qpid::sys::Duration(_timeout * qpid::sys::TIME_SEC)), mgr(_mgr), xid(_xid) {} + : TimerTask(qpid::sys::Duration(_timeout * qpid::sys::TIME_SEC),"DtxCleanup"), mgr(_mgr), xid(_xid) {} void DtxManager::DtxCleanup::fire() { diff --git a/cpp/src/qpid/broker/DtxTimeout.cpp b/cpp/src/qpid/broker/DtxTimeout.cpp index f5238d0909..c4c52ec40a 100644 --- a/cpp/src/qpid/broker/DtxTimeout.cpp +++ b/cpp/src/qpid/broker/DtxTimeout.cpp @@ -25,7 +25,7 @@ using namespace qpid::broker; DtxTimeout::DtxTimeout(uint32_t _timeout, DtxManager& _mgr, const std::string& _xid) - : TimerTask(qpid::sys::Duration(_timeout * qpid::sys::TIME_SEC)), timeout(_timeout), mgr(_mgr), xid(_xid) + : TimerTask(qpid::sys::Duration(_timeout * qpid::sys::TIME_SEC),"DtxTimeout"), timeout(_timeout), mgr(_mgr), xid(_xid) { } diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/cpp/src/qpid/broker/LinkRegistry.cpp index 592b64449d..49e0ec33e5 100644 --- a/cpp/src/qpid/broker/LinkRegistry.cpp +++ b/cpp/src/qpid/broker/LinkRegistry.cpp @@ -64,7 +64,7 @@ LinkRegistry::~LinkRegistry() } LinkRegistry::Periodic::Periodic (LinkRegistry& _links) : - TimerTask (Duration (LINK_MAINT_INTERVAL * TIME_SEC)), links(_links) {} + TimerTask (Duration (LINK_MAINT_INTERVAL * TIME_SEC),"LinkRegistry"), links(_links) {} void LinkRegistry::Periodic::fire () { diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/cpp/src/qpid/broker/QueueCleaner.cpp index ed98468490..6cdf506873 100644 --- a/cpp/src/qpid/broker/QueueCleaner.cpp +++ b/cpp/src/qpid/broker/QueueCleaner.cpp @@ -39,7 +39,7 @@ void QueueCleaner::start(qpid::sys::Duration p) timer.add(task); } -QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : sys::TimerTask(d), parent(p) {} +QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : sys::TimerTask(d,"QueueCleaner"), parent(p) {} void QueueCleaner::Task::fire() { diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp index 426ef190dd..6f02399795 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -213,7 +213,7 @@ struct ScheduledCreditTask : public sys::TimerTask { SessionState& sessionState; ScheduledCreditTask(const qpid::sys::Duration& d, sys::Timer& t, SessionState& s) : - TimerTask(d), + TimerTask(d,"ScheduledCredit"), timer(t), sessionState(s) {} diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp index 44819a88a2..40c004f166 100644 --- a/cpp/src/qpid/client/ConnectionImpl.cpp +++ b/cpp/src/qpid/client/ConnectionImpl.cpp @@ -154,7 +154,7 @@ class HeartbeatTask : public TimerTask { public: HeartbeatTask(Duration p, TimeoutHandler& t) : - TimerTask(p), + TimerTask(p,"Heartbeat"), timeout(t) {} }; diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp index 190eeb7293..e1ba420f2a 100644 --- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp +++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp @@ -35,7 +35,7 @@ ExpiryPolicy::ExpiryPolicy(Multicaster& m, const MemberId& id, sys::Timer& t) struct ExpiryTask : public sys::TimerTask { ExpiryTask(const boost::intrusive_ptr<ExpiryPolicy>& policy, uint64_t id, sys::AbsTime when) - : TimerTask(when), expiryPolicy(policy), expiryId(id) {} + : TimerTask(when,"ExpiryPolicy"), expiryPolicy(policy), expiryId(id) {} void fire() { expiryPolicy->sendExpire(expiryId); } boost::intrusive_ptr<ExpiryPolicy> expiryPolicy; const uint64_t expiryId; diff --git a/cpp/src/qpid/cluster/WatchDogPlugin.cpp b/cpp/src/qpid/cluster/WatchDogPlugin.cpp index 9b19b4f95f..57ba5cf2fd 100644 --- a/cpp/src/qpid/cluster/WatchDogPlugin.cpp +++ b/cpp/src/qpid/cluster/WatchDogPlugin.cpp @@ -76,7 +76,7 @@ struct WatchDogTask : public sys::TimerTask { int interval; WatchDogTask(int pid_, sys::Timer& t, int _interval) - : TimerTask(_interval*sys::TIME_SEC/2), pid(pid_), timer(t), interval(_interval) {} + : TimerTask(_interval*sys::TIME_SEC/2,"WatchDog"), pid(pid_), timer(t), interval(_interval) {} void fire() { timer.add (new WatchDogTask(pid, timer, interval)); 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(); diff --git a/cpp/src/tests/TimerTest.cpp b/cpp/src/tests/TimerTest.cpp index 1552421ba0..7df94164e0 100644 --- a/cpp/src/tests/TimerTest.cpp +++ b/cpp/src/tests/TimerTest.cpp @@ -60,7 +60,7 @@ class TestTask : public TimerTask public: TestTask(Duration timeout, Counter& _counter) - : TimerTask(timeout), start(now()), expected(timeout), end(start), fired(false), counter(_counter) {} + : TimerTask(timeout, "Test"), start(now()), expected(timeout), end(start), fired(false), counter(_counter) {} void fire() { |