From 4d28227e5247f01d2bf9873af0dee5d28e4c5e97 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 7 Aug 2007 22:28:06 +0000 Subject: * Summary: new Frame type to replace AMQFrame. Instead of holding a shared_ptr to a heap-allocated AMQBody subclass, it holds the body in-line in a boost::variant of all the concrete AMQBody subclasses. Actually there are nested variants, the compiler does not cope well with a single variant of 130-some types. Creating, encoding and decoding a local Frame doess 0 heap allocation apart from that done by the concrete AMQBody::encode/decode - e.g. method bodies with std::string fields. for method bodies All variants contain type boost::blank. This guarantees 0 heap alloocation by the variant and represents the "uninitialized" state. variant.h provides NoBlankVisitor to help write visitors for variants containing blank. * src/qpid/framing/MethodHolder.h, .cpp: Holds a variant containing a method body. * src/qpid/framing/Frame.h, .cpp: New Frame holds body in a variant rather than via heap allocation. * src/qpid/framing/variant.h: Utilities for using boost::variant. * src/qpid/framing/amqp_types.h: Added FrameType typedef. * src/qpid/framing/AMQMethodBody.h: Friends with MethodHolder. * src/Makefile.am: - Improved ruby generation rule. - Run method_variants template. - Added new source files - Pre-compiled header rule for method_variants.h * rubygen/templates/method_variants.rb: Generate variants to hold methods of each class, and MethodVariant to hold all the class variants. * rubygen/cppgen.rb: variant, tuple methods. * MethodBodyClass.h.tmpl: Added default constructor to method bodies. * amqpgen.rb (AmqpRoot::merge): fix bug in merge. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@563683 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl') diff --git a/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl index aeabd8a256..605b09ac94 100644 --- a/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl +++ b/qpid/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl @@ -63,7 +63,7 @@ public: ${mb_constructor_with_initializers} - ${CLASS}${METHOD}Body(ProtocolVersion version): ${mb_base_class}(version) {} + ${CLASS}${METHOD}Body(ProtocolVersion version=ProtocolVersion() ): ${mb_base_class}(version) {} virtual ~${CLASS}${METHOD}Body() {} // Attribute get methods -- cgit v1.2.1