From 49c7a491c98c26fe7d4f017a7ba655dfc029278c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 16 Aug 2007 20:12:33 +0000 Subject: AMQBodies are no longer allocated on the heap and passed with shared_ptr. AMQFrame contains a boost::variant of AMQHeaderBody,AMQContentBody, AMQHeatbeatBody, and MethodHolder. A variant is basically a type-safe union, it can allocate any of the types in-place. MethodHolder contains a Blob, a less sophisticated kind of variant, which can contain any of the concrete method body types. Using variants for all the method types causes outrageous compile times and bloated library symbol names. Blob lacks some of the finer features of variant and needs help from generated code. For now both are hidden to the rest of the code base behind AMQFrame and MethodBody classes so if/when we decide to settle on just one "variant" type solution we can do so. This commit touches nearly 100 files, mostly converting method signatures with shared_ptr to FooBody* or FooBody&, and converting stored shared_ptr to AMQFrame and share_ptr to MethodHolder. There is one outstanding client memory leak, which I will fix in my next commit. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@566822 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ReferenceTest.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'cpp/src/tests/ReferenceTest.cpp') diff --git a/cpp/src/tests/ReferenceTest.cpp b/cpp/src/tests/ReferenceTest.cpp index b3dd44bf7d..411462564a 100644 --- a/cpp/src/tests/ReferenceTest.cpp +++ b/cpp/src/tests/ReferenceTest.cpp @@ -67,17 +67,17 @@ class ReferenceTest : public CppUnit::TestCase Reference::shared_ptr r1(registry.open("bar")); - MessageTransferBody::shared_ptr t1(new MessageTransferBody(v)); + MessageTransferBody t1(v); // TODO aconway 2007-04-03: hack around lack of generated setters. Clean this up. - const_cast(t1->getBody()) = framing::Content(REFERENCE,"bar"); - MessageMessage::shared_ptr m1(new MessageMessage(0, t1, r1)); + const_cast(t1.getBody()) = framing::Content(REFERENCE,"bar"); + MessageMessage::shared_ptr m1(new MessageMessage(0, &t1, r1)); - MessageTransferBody::shared_ptr t2(new MessageTransferBody(v)); - const_cast(t2->getBody()) = framing::Content(REFERENCE,"bar"); - MessageMessage::shared_ptr m2(new MessageMessage(0, t2, r1)); + MessageTransferBody t2(v); + const_cast(t2.getBody()) = framing::Content(REFERENCE,"bar"); + MessageMessage::shared_ptr m2(new MessageMessage(0, &t2, r1)); - MessageAppendBody::shared_ptr a1(new MessageAppendBody(v)); - MessageAppendBody::shared_ptr a2(new MessageAppendBody(v)); + MessageAppendBody a1(v); + MessageAppendBody a2(v); r1->addMessage(m1); r1->addMessage(m2); @@ -86,12 +86,6 @@ class ReferenceTest : public CppUnit::TestCase r1->append(a2); CPPUNIT_ASSERT_EQUAL(size_t(2), r1->getAppends().size()); r1->close(); - - CPPUNIT_ASSERT_EQUAL(m1->getReference()->getAppends()[0], a1); - CPPUNIT_ASSERT_EQUAL(m1->getReference()->getAppends()[1], a2); - - CPPUNIT_ASSERT_EQUAL(m2->getReference()->getAppends()[0], a1); - CPPUNIT_ASSERT_EQUAL(m2->getReference()->getAppends()[1], a2); } }; -- cgit v1.2.1