Remove 'clever' locking as it actually degrades performance.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@687361 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 12 deletions

diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/src/qpid/broker/Queue.h
index 347fc5cf9d..8b8ba8278f 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -63,17 +63,6 @@ namespace qpid {
             typedef qpid::InlineVector<Consumer*, 5> Listeners;
             typedef std::deque<QueuedMessage> Messages;
 
-            class Guard 
-            {
-                qpid::sys::Condition condition;
-                size_t count;
-              public:
-                Guard();
-                void lock();
-                void unlock();
-                void wait(sys::Mutex&);
-            };
-
             const string name;
             const bool autodelete;
             MessageStore* store;
@@ -88,7 +77,6 @@ namespace qpid {
             mutable qpid::sys::Mutex consumerLock;
             mutable qpid::sys::Mutex messageLock;
             mutable qpid::sys::Mutex ownershipLock;
-            Guard notifierLock;
             mutable uint64_t persistenceId;
             framing::FieldTable settings;
             std::auto_ptr<QueuePolicy> policy;