From a1eaf3a3abf8fc22a235b4ca1ce902be2834b3d9 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 11 Aug 2010 10:06:24 +0000 Subject: Revert commits r981517 and r981435 that moved periodic purging of queues onto cluster's timer. If the timer fires during an update it causes errors; it also puts a potentially time consuming task on the clusters dispatch thread. Instead don't purge LVQs to avoid cluster inconsistencies (and more directly the assertion that aims to prevent these). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@984357 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueueCleaner.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'cpp/src/qpid/broker/QueueCleaner.cpp') diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/cpp/src/qpid/broker/QueueCleaner.cpp index a3d06cc4f7..ed98468490 100644 --- a/cpp/src/qpid/broker/QueueCleaner.cpp +++ b/cpp/src/qpid/broker/QueueCleaner.cpp @@ -26,27 +26,20 @@ namespace qpid { namespace broker { -QueueCleaner::QueueCleaner(QueueRegistry& q, sys::Timer* t) : queues(q), timer(t) {} +QueueCleaner::QueueCleaner(QueueRegistry& q, sys::Timer& t) : queues(q), timer(t) {} QueueCleaner::~QueueCleaner() { if (task) task->cancel(); } -void QueueCleaner::setTimer(sys::Timer* t) -{ - timer = t; -} - void QueueCleaner::start(qpid::sys::Duration p) { - if (timer) { - task = new Task(*this, p); - timer->add(task); - } + task = new Task(*this, p); + timer.add(task); } -QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : sys::TimerTask(d, "QueueCleaner::fired"), parent(p) {} +QueueCleaner::Task::Task(QueueCleaner& p, qpid::sys::Duration d) : sys::TimerTask(d), parent(p) {} void QueueCleaner::Task::fire() { @@ -73,7 +66,7 @@ void QueueCleaner::fired() queues.eachQueue(collect); std::for_each(copy.begin(), copy.end(), boost::bind(&Queue::purgeExpired, _1)); task->setupNextFire(); - if (timer) timer->add(task); + timer.add(task); } -- cgit v1.2.1