2007-06-25 <aconway@redhat.com>

	Cluster class implementing cluster membership map.
	* src/qpid/cluster/Cluster.cpp: Cluster membership implementation.
	* src/qpid/cluster/Cpg.cpp: Support for boost::function callbacks.
	* src/tests/Url.cpp: Implements AMQP-95 URL format.
	* xml/cluster.xml: Cluster join method.

	Build/packaging
	* README: Remove mention of openais till clustering is functional.
	For now it is optional and we depend on an unpackaged version. 
	* configure.ac: Check openais has cpg_local_get().
	* Makefile.am: Added cluster.xml to EXTRA_DIST.
	* src/generate.sh: add cluster.xml to codegen.
	* src/tests/Makefile.am:
	 - Generate individual "sudo -u ais" wrappers for openais tests.
	 - Drop "unit" directory, all unit tests in "tests" directory

	Minor changes:
	* src/qpid/sys/posix/Socket.cpp:
	* src/qpid/sys/posix/PosixAcceptor.cpp: 
	* src/qpid/sys/posix/EventChannelAcceptor.cpp: 
	* src/qpid/sys/apr/APRAcceptor.cpp: 
	* src/qpid/sys/Acceptor.h (getHost): Added getHost()
	* src/tests/.valgrind.supp-default: Suppress benign valgrind
	warning in libcpg.


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

1 files changed, 107 insertions, 0 deletions

diff --git a/qpid/cpp/src/tests/Cpg.cpp b/qpid/cpp/src/tests/Cpg.cpp
new file mode 100644
index 0000000000..97b829ea63
--- /dev/null
+++ b/qpid/cpp/src/tests/Cpg.cpp
@@ -0,0 +1,107 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.
+ *
+ */
+
+#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
+#include <boost/test/auto_unit_test.hpp>
+#include "test_tools.h"
+#include "qpid/cluster/Cpg.h"
+#include "qpid/framing/AMQBody.h"
+#include <boost/bind.hpp>
+#include <string>
+#include <iostream>
+#include <iterator>
+#include <vector>
+#include <algorithm>
+
+using namespace std;
+using namespace qpid::cluster;
+using namespace qpid::framing;
+
+// For debugging: op << for CPG types.
+
+ostream& operator<<(ostream& o, const cpg_name* n) {
+    return o << qpid::cluster::Cpg::str(*n);
+}
+
+ostream& operator<<(ostream& o, const cpg_address& a) {
+    return o << "(" << a.nodeid <<","<<a.pid<<","<<a.reason<<")";
+}
+
+template <class T>
+ostream& operator<<(ostream& o, const pair<T*, int>& array) {
+    o << "{ ";
+    ostream_iterator<cpg_address> i(o, " ");
+    copy(array.first, array.first+array.second, i);
+    cout << "}";
+    return o;
+}
+
+struct Callback {
+    Callback(const string group_) : group(group_) {}
+    string group;
+    vector<string> delivered;
+    vector<int> configChanges;
+
+    void deliver (
+        cpg_handle_t /*handle*/,
+        struct cpg_name *grp,
+        uint32_t /*nodeid*/,
+        uint32_t /*pid*/,
+        void* msg,
+        int msg_len)
+    {
+        BOOST_CHECK_EQUAL(group, Cpg::str(*grp));
+        delivered.push_back(string((char*)msg,msg_len));
+    }
+
+    void configChange(
+        cpg_handle_t /*handle*/,
+        struct cpg_name *grp,
+        struct cpg_address */*members*/, int nMembers,
+        struct cpg_address */*left*/, int /*nLeft*/,
+        struct cpg_address */*joined*/, int /*nJoined*/
+    )
+    {
+        BOOST_CHECK_EQUAL(group, Cpg::str(*grp));
+        configChanges.push_back(nMembers);
+    }
+};
+
+BOOST_AUTO_TEST_CASE(Cpg_basic) {
+    // Verify basic functionality of cpg. This will catch any
+    // openais configuration or permission errors.
+    //
+    Cpg::Name group("foo");
+    Callback cb(group.str());
+    Cpg::DeliverFn deliver=boost::bind(&Callback::deliver, &cb, _1, _2, _3, _4, _5, _6);
+    Cpg::ConfigChangeFn reconfig=boost::bind<void>(&Callback::configChange, &cb, _1, _2, _3, _4, _5, _6, _7, _8);
+
+    Cpg cpg(deliver, reconfig);
+    cpg.join(group);
+    iovec iov = { (void*)"Hello!", 6 };
+    cpg.mcast(group, &iov, 1);
+    cpg.leave(group);
+    cpg.dispatchSome();
+
+    BOOST_REQUIRE_EQUAL(1u, cb.delivered.size());
+    BOOST_CHECK_EQUAL("Hello!", cb.delivered.front());
+    BOOST_REQUIRE_EQUAL(2u, cb.configChanges.size());
+    BOOST_CHECK_EQUAL(1, cb.configChanges[0]);
+    BOOST_CHECK_EQUAL(0, cb.configChanges[1]);
+}
+