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/src/Makefile.am | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src/Makefile.am') diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am index ad720754c1..c74c27d42a 100644 --- a/qpid/cpp/src/Makefile.am +++ b/qpid/cpp/src/Makefile.am @@ -43,13 +43,15 @@ maintainer-clean-local: rgen_dir=$(top_srcdir)/rubygen rgen_tdir=$(rgen_dir)/templates -rgen_script=$(rgen_dir)/generate -rgen_cmd=ruby -I $(rgen_dir) $(rgen_script) +rgen_generator=$(rgen_dir)/generate $(rgen_dir)/amqpgen.rb $(rgen_dir)/cppgen.rb -rgen_templates=$(rgen_tdir)/frame_body_lists.rb $(rgen_tdir)/Session.rb +rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate +rgen_templates=$(rgen_tdir)/method_variants.rb $(rgen_tdir)/frame_body_lists.rb $(rgen_tdir)/Session.rb -rubygen.mk: $(rgen_script) $(specs) $(rgen_templates) - gen=`$(rgen_cmd) . $(specs) $(rgen_templates)` ; echo Generated $$gen; echo rgen_srcs=$$gen > $@ +rubygen.mk: $(rgen_generator) $(specs) $(rgen_templates) + { echo "rgen_srcs= \\"; \ + for f in `$(rgen_cmd) . $(specs) $(rgen_templates) `; do echo " $$f \\"; done; \ + echo; } > $@ $(rgen_srcs): rubygen.mk @@ -172,7 +174,11 @@ libqpidcommon_la_SOURCES = \ qpid/log/Selector.h \ qpid/log/Statement.cpp \ qpid/log/Statement.h \ - qpid/memory.h + qpid/memory.h \ + qpid/framing/Frame.cpp qpid/framing/Frame.h \ + qpid/framing/method_variants.h \ + qpid/framing/MethodHolder.cpp qpid/framing/MethodHolder.h + libqpidbroker_la_LIBADD = libqpidcommon.la -lboost_iostreams libqpidbroker_la_SOURCES = \ @@ -410,3 +416,16 @@ nobase_include_HEADERS = \ # Force build of qpidd during dist phase so help2man will work. dist-hook: qpidd + +# FIXME aconway 2007-08-06: Use of gch should be conditional on gcc version. + +# Pre compiled headers - use BUILT_SOURCES to get them built first. +BUILT_SOURCES=qpid/framing/method_variants.h.gch +sinclude qpid/framing/method_variants.h.gch.deps +CLEANFILES=qpid/framing/method_variants.h.gch qpid/framing/method_variants.h.gch.deps + +SUFFIXES=.h.gch +.h.h.gch: + rm -f $@ + $(CXXCOMPILE) -MT $@ -MD -MP -MF $@.deps -fPIC -DPIC -x c++-header -c -o $@ $< + -- cgit v1.2.1