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<FooBody> to FooBody* or FooBody&, and
converting stored shared_ptr<AMQBody> to AMQFrame and
share_ptr<AMQMethodBody> 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

1 files changed, 11 insertions, 10 deletions

diff --git a/cpp/src/qpid/client/ReceivedContent.cpp b/cpp/src/qpid/client/ReceivedContent.cpp
index 9cfee21c3c..5a1f48901a 100644
--- a/cpp/src/qpid/client/ReceivedContent.cpp
+++ b/cpp/src/qpid/client/ReceivedContent.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "ReceivedContent.h"
+#include "qpid/framing/all_method_bodies.h"
 
 using qpid::client::ReceivedContent;
 using namespace qpid::framing;
@@ -27,9 +28,9 @@ using namespace boost;
 
 ReceivedContent::ReceivedContent(const SequenceNumber& _id) : id(_id) {}
 
-void ReceivedContent::append(AMQBody::shared_ptr part)
+void ReceivedContent::append(AMQBody* part)
 {
-    parts.push_back(part);
+    parts.push_back(AMQFrame(ProtocolVersion(), 0, part));
 }
 
 bool ReceivedContent::isComplete() const
@@ -37,7 +38,7 @@ bool ReceivedContent::isComplete() const
     if (parts.empty()) {
          return false;
     } else if (isA<BasicDeliverBody>() || isA<BasicGetOkBody>()) {
-        AMQHeaderBody::shared_ptr headers(getHeaders());
+        const AMQHeaderBody* headers(getHeaders());
         return headers && headers->getContentSize() == getContentSize();
     } else if (isA<MessageTransferBody>()) {
         //no longer support references, headers and data are still method fields
@@ -48,14 +49,14 @@ bool ReceivedContent::isComplete() const
 }
 
 
-AMQMethodBody::shared_ptr ReceivedContent::getMethod() const
+const AMQMethodBody* ReceivedContent::getMethod() const
 {
-    return parts.empty() ? AMQMethodBody::shared_ptr() : dynamic_pointer_cast<AMQMethodBody>(parts[0]);
+    return parts.empty() ? 0 : dynamic_cast<const AMQMethodBody*>(parts[0].getBody());
 }
 
-AMQHeaderBody::shared_ptr ReceivedContent::getHeaders() const
+const AMQHeaderBody* ReceivedContent::getHeaders() const
 {
-    return parts.size() < 2 ? AMQHeaderBody::shared_ptr() : dynamic_pointer_cast<AMQHeaderBody>(parts[1]);
+    return parts.size() < 2 ? 0 : dynamic_cast<const AMQHeaderBody*>(parts[1].getBody());
 }
 
 uint64_t ReceivedContent::getContentSize() const
@@ -63,7 +64,7 @@ uint64_t ReceivedContent::getContentSize() const
     if (isA<BasicDeliverBody>() || isA<BasicGetOkBody>()) {
         uint64_t size(0);
         for (uint i = 2; i < parts.size(); i++) {
-            size += parts[i]->size();
+            size += parts[i].getBody()->size();
         }
         return size;
     } else if (isA<MessageTransferBody>()) {
@@ -78,7 +79,7 @@ std::string ReceivedContent::getContent() const
     if (isA<BasicDeliverBody>() || isA<BasicGetOkBody>()) {
         string data;
         for (uint i = 2; i < parts.size(); i++) {
-            data += dynamic_pointer_cast<AMQContentBody>(parts[i])->getData();
+            data += static_cast<const AMQContentBody*>(parts[i].getBody())->getData();
         }
         return data;
     } else if (isA<MessageTransferBody>()) {
@@ -93,7 +94,7 @@ void ReceivedContent::populate(Message& msg)
     if (!isComplete()) throw Exception("Incomplete message");
 
     if (isA<BasicDeliverBody>() || isA<BasicGetOkBody>()) {
-        BasicHeaderProperties* properties = dynamic_cast<BasicHeaderProperties*>(getHeaders()->getProperties());
+        const BasicHeaderProperties* properties = dynamic_cast<const BasicHeaderProperties*>(getHeaders()->getProperties());
         BasicHeaderProperties::copy<Message, BasicHeaderProperties>(msg, *properties);
         msg.setData(getContent());
     } else if (isA<MessageTransferBody>()) {