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/framing/AMQFrame.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'cpp/src/qpid/framing/AMQFrame.h') diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h index bef1b01df4..1a7b203ad7 100644 --- a/cpp/src/qpid/framing/AMQFrame.h +++ b/cpp/src/qpid/framing/AMQFrame.h @@ -48,7 +48,7 @@ class AMQFrame : public AMQDataBlock virtual void encode(Buffer& buffer); virtual bool decode(Buffer& buffer); virtual uint32_t size() const; - uint16_t getChannel(); + uint16_t getChannel() const { return channel; } AMQBody::shared_ptr getBody(); /** Convenience template to cast the body to an expected type */ @@ -60,18 +60,17 @@ class AMQFrame : public AMQDataBlock uint32_t decodeHead(Buffer& buffer); void decodeBody(Buffer& buffer, uint32_t size); - private: - static AMQP_MethodVersionMap versionMap; - ProtocolVersion version; - uint16_t channel; uint8_t type; AMQBody::shared_ptr body; - + ProtocolVersion version; - friend std::ostream& operator<<(std::ostream& out, const AMQFrame& body); + private: + static AMQP_MethodVersionMap versionMap; }; +std::ostream& operator<<(std::ostream&, const AMQFrame&); + }} // namespace qpid::framing -- cgit v1.2.1