From fda6dadde945a9c73c97b73dc79e93368b743348 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 29 Jun 2007 17:59:00 +0000 Subject: * Summary: - Improved plugin framework and HandlerUpdater interface. - Cluster handlers for traffic to/from cluster. - Cluster HandlerUpdater configures channel chains for cluster. - Cluster PluginProvider registers cluster objects with broker. * src/qpid/framing/AMQFrame.h: Made data members public. Handlers need to be able to modify frame data, getters/setters are just a nuisance here. * src/tests/Cluster.cpp: Updated for cluster changes, using handlers instead of friendship to hook test into Cluster code. * src/qpid/framing/amqp_types.h: Added CHANNEL_MAX and CHANNEL_HIGH_BIT constants. * src/qpid/framing/HandlerUpdater.h: Renamed ChannelInitializer, broke dependency on broker channel types. * src/qpid/framing/Handler.h: Added constructors and nextHandler() * src/qpid/framing/AMQFrame.h (class AMQFrame): Inlined getChannel() * src/qpid/cluster/ClusterPluginProvider.cpp: Provider for cluster plugins. * src/qpid/cluster/Cluster.cpp: Use ChannelManager. Factor out plugin details to ClusterPluginProvider. * src/qpid/cluster/ChannelManager.h: Insert cluster handlers into channel chains, route frames between cluster and channels. * src/qpid/broker/BrokerAdapter.cpp (startOk): use CHANNEL_MAX constant. * src/qpid/broker/Broker.cpp: - Refactored for new plugin framework. - Added getUrl(). * src/qpid/Url.h: Added constructor from Address. * src/qpid/Plugin.h: Generalized plugin framework, broke dependency on Broker interfaces. We may want to use plug-ins for clients also at some point. * src/tests/run_test: Fix bug when VALGRIND is not set. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551981 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/cluster/ClusterPluginProvider.cpp | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 cpp/src/qpid/cluster/ClusterPluginProvider.cpp (limited to 'cpp/src/qpid/cluster/ClusterPluginProvider.cpp') diff --git a/cpp/src/qpid/cluster/ClusterPluginProvider.cpp b/cpp/src/qpid/cluster/ClusterPluginProvider.cpp new file mode 100644 index 0000000000..3a09a66b81 --- /dev/null +++ b/cpp/src/qpid/cluster/ClusterPluginProvider.cpp @@ -0,0 +1,66 @@ +/* + * + * 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. + * + */ +#include "qpid/broker/Broker.h" +#include "qpid/framing/HandlerUpdater.h" +#include "qpid/cluster/Cluster.h" +#include "qpid/cluster/ChannelManager.h" +#include "qpid/Plugin.h" +#include "qpid/Options.h" + +namespace qpid { +namespace cluster { + +using namespace std; + +struct ClusterPluginProvider : public PluginProvider { + + struct ClusterOptions : public Options { + string clusterName; + ClusterOptions() { + addOptions() + ("cluster", optValue(clusterName, "NAME"), + "Join the cluster named NAME"); + } + }; + + ClusterOptions options; + shared_ptr cluster; + + Options* getOptions() { + return &options; + } + + void provide(PluginUser& user) { + broker::Broker* broker = dynamic_cast(&user); + // Only provide to a Broker, and only if the --cluster config is set. + if (broker && !options.clusterName.empty()) { + assert(!cluster); // A process can only belong to one cluster. + cluster.reset(new Cluster(options.clusterName, broker->getUrl())); + + // Channel manager is both the next handler for the cluster + // and the HandlerUpdater plugin for the broker. + shared_ptr manager(new ChannelManager(cluster)); + cluster->join(manager); + broker->use(manager); + } + } +}; + +static ClusterPluginProvider instance; // Static initialization. + +}} // namespace qpid::cluster -- cgit v1.2.1