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/broker/Plugin.cpp | 67 ------------------------------------------ 1 file changed, 67 deletions(-) delete mode 100644 cpp/src/qpid/broker/Plugin.cpp (limited to 'cpp/src/qpid/broker/Plugin.cpp') diff --git a/cpp/src/qpid/broker/Plugin.cpp b/cpp/src/qpid/broker/Plugin.cpp deleted file mode 100644 index f018c4e152..0000000000 --- a/cpp/src/qpid/broker/Plugin.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * - * 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 "Plugin.h" - -namespace qpid { -namespace broker { - -std::vector Plugin::plugins; - -Plugin::Plugin() { - // Register myself. - plugins.push_back(this); -} - -Plugin::~Plugin() {} - -Options* Plugin::getOptions() { return 0; } - -void Plugin::start(Broker&) {} - -void Plugin::finish(Broker&) {} - -const std::vector& Plugin::getPlugins() { return plugins; } - -#ifdef USE_APR_PLATFORM - -#include "qpid/sys/apr/APRBase.h" -#include "qpid/sys/apr/APRPool.h" -#include - -void Plugin::dlopen(const std::string& name) { - apr_dso_handle_t* handle; - CHECK_APR_SUCCESS( - apr_dso_load(&handle, name.c_str(), sys::APRPool::get())); -} - -#else // Posix - -#include - -void Plugin::dlopen(const std::string& name) { - dlerror(); - dlopen(name.c_str(), RTLD_NOW); - const char* error = dlerror(); - if (error) { - THROW_QPID_ERROR(INTERNAL_ERROR, error); - } -} -#endif // USE_APR_PLATFORM - -}} // namespace qpid::broker -- cgit v1.2.1