Fixed race conditions in cluster.

Execute all cluster logic in frameDeliverQueue thread,
decoding only in eventDeliverQueue thread.


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

1 files changed, 0 insertions, 84 deletions

diff --git a/cpp/src/qpid/cluster/ConnectionMap.cpp b/cpp/src/qpid/cluster/ConnectionMap.cpp
deleted file mode 100644
index d4b2aa6675..0000000000
--- a/cpp/src/qpid/cluster/ConnectionMap.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "ConnectionMap.h"
-#include "Cluster.h"
-#include "qpid/framing/reply_exceptions.h"
-#include "qpid/log/Statement.h"
-#include "qpid/assert.h"
-
-namespace qpid {
-namespace cluster {
-
-using framing::InternalErrorException;
-typedef sys::Mutex::ScopedLock Lock;
-
-void ConnectionMap::insert(ConnectionPtr p) {
-    Lock l(lock);
-    std::pair<Map::iterator, bool> ib = map.insert(Map::value_type(p->getId(), p));
-    QPID_ASSERT(ib.second);
-}
-
-void ConnectionMap::erase(const ConnectionId& id) {
-    Lock l(lock);
-    size_t erased = map.erase(id);
-    assert(erased);
-    (void)erased;               // Avoid unused variable warnings.
-}
-
-ConnectionMap::ConnectionPtr ConnectionMap::get(const ConnectionId& id) {
-    Lock l(lock);
-    Map::const_iterator i = map.find(id);
-    if (i == map.end()) {
-        // Deleted local connection.
-        if(id.getMember() == cluster.getId())
-            return 0;
-        // New remote connection, create a shadow.
-        std::ostringstream mgmtId;
-        mgmtId << id;
-        ConnectionPtr cp = new Connection(cluster, shadowOut, mgmtId.str(), id);
-        std::pair<Map::iterator, bool> ib = map.insert(Map::value_type(id, cp)); 
-        QPID_ASSERT(ib.second);
-        i = ib.first;
-    }
-    return i->second;
-}
-
-ConnectionMap::Vector ConnectionMap::values() const {
-    Lock l(lock);
-    Vector result(map.size());
-    std::transform(map.begin(), map.end(), result.begin(),
-                   boost::bind(&Map::value_type::second, _1));
-    return result;
-}
-
-void ConnectionMap::clear() {
-    Lock l(lock);
-    map.clear();
-}
-
-void ConnectionMap::decode(const EventHeader& eh, const void* data) {
-    ConnectionPtr connection = get(eh.getConnectionId());
-    if (connection)
-        connection->decode(eh, data);
-}
-
-
-}} // namespace qpid::cluster