diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-12-21 17:04:22 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-12-21 17:04:22 +0000 |
| commit | af21f1bdc2a944eb3b6993f159e8e3ff8bca1629 (patch) | |
| tree | 1a8553ff266bbb4e9fd8ae7d3f4afc9900a7257b /qpid/cpp/src | |
| parent | 5aa923eb8c6db15a426512f706113e541bdee2ec (diff) | |
| download | qpid-python-af21f1bdc2a944eb3b6993f159e8e3ff8bca1629.tar.gz | |
NO-JIRA: Removed some unused Timer features (old cluster used to use them)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1425036 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/Timer.cpp | 9 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/sys/Timer.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/qpid/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp index 6947c787b4..f8eef2c9ec 100644 --- a/qpid/cpp/src/qpid/sys/Timer.cpp +++ b/qpid/cpp/src/qpid/sys/Timer.cpp @@ -96,6 +96,7 @@ void TimerTask::cancel() { state = CANCELLED; } +// TODO AStitcher 21/08/09 The threshholds for emitting warnings are a little arbitrary Timer::Timer() : active(false), late(50 * TIME_MSEC), @@ -127,7 +128,6 @@ public: } }; -// TODO AStitcher 21/08/09 The threshholds for emitting warnings are a little arbitrary void Timer::run() { Monitor::ScopedLock l(monitor); @@ -145,10 +145,6 @@ void Timer::run() { TimerTaskCallbackScope s(*t); if (s) { - { - Monitor::ScopedUnlock u(monitor); - drop(t); - } if (delay > lateCancel) { QPID_LOG(debug, t->name << " cancelled timer woken up " << delay / TIME_MSEC << "ms late"); @@ -229,9 +225,6 @@ void Timer::fire(boost::intrusive_ptr<TimerTask> t) { } } -// Provided for subclasses: called when a task is droped. -void Timer::drop(boost::intrusive_ptr<TimerTask>) {} - bool operator<(const intrusive_ptr<TimerTask>& a, const intrusive_ptr<TimerTask>& b) { diff --git a/qpid/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h index cd08e12e1a..5045009609 100644 --- a/qpid/cpp/src/qpid/sys/Timer.h +++ b/qpid/cpp/src/qpid/sys/Timer.h @@ -95,7 +95,7 @@ class Timer : private Runnable { protected: QPID_COMMON_EXTERN virtual void fire(boost::intrusive_ptr<TimerTask> task); - QPID_COMMON_EXTERN virtual void drop(boost::intrusive_ptr<TimerTask> task); + // Allow derived classes to change the late/overran thresholds. Duration late; Duration overran; |