From 943689bc77e922bc6589da53521e40aff5c7677b Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 22 Jun 2010 15:42:35 +0000 Subject: Don't hold QueueRegistry lock while iterating over queues to purge them of expired messages. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@956923 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueueCleaner.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/cpp/src/qpid/broker/QueueCleaner.cpp index c80fe89035..ed98468490 100644 --- a/cpp/src/qpid/broker/QueueCleaner.cpp +++ b/cpp/src/qpid/broker/QueueCleaner.cpp @@ -46,9 +46,25 @@ void QueueCleaner::Task::fire() parent.fired(); } +namespace { +struct CollectQueues +{ + std::vector* queues; + CollectQueues(std::vector* q) : queues(q) {} + void operator()(Queue::shared_ptr q) + { + queues->push_back(q); + } +}; +} + void QueueCleaner::fired() { - queues.eachQueue(boost::bind(&Queue::purgeExpired, _1)); + //collect copy of list of queues to avoid holding registry lock while we perform purge + std::vector copy; + CollectQueues collect(©); + queues.eachQueue(collect); + std::for_each(copy.begin(), copy.end(), boost::bind(&Queue::purgeExpired, _1)); task->setupNextFire(); timer.add(task); } -- cgit v1.2.1