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

3 files changed, 10 insertions, 10 deletions

diff --git a/cpp/src/qpid/cluster/ClassifierHandler.cpp b/cpp/src/qpid/cluster/ClassifierHandler.cpp
index 1cce126800..9410a3cc38 100644
--- a/cpp/src/qpid/cluster/ClassifierHandler.cpp
+++ b/cpp/src/qpid/cluster/ClassifierHandler.cpp
@@ -36,7 +36,7 @@ typedef uint32_t FullMethodId;  // Combind class & method ID.
 
 FullMethodId fullId(ClassId c, MethodId m) { return c<<16+m; }
 
-FullMethodId fullId(const shared_ptr<AMQMethodBody>& body) {
+FullMethodId fullId(const AMQMethodBody*& body) {
     return fullId(body->amqpClassId(), body->amqpMethodId());
 }
 
@@ -59,8 +59,8 @@ void  ClassifierHandler::handle(AMQFrame& frame) {
     // TODO aconway 2007-07-03: Flatten the frame hierarchy so we
     // can do a single lookup to dispatch a frame.
     Chain chosen;
-    shared_ptr<AMQMethodBody> method =
-        dynamic_pointer_cast<AMQMethodBody>(frame.getBody());
+    AMQMethodBody* method = dynamic_cast<AMQMethodBody*>(frame.getBody());
+
     // FIXME aconway 2007-07-05: Need to stop bypassed frames
     // from overtaking mcast frames.
     //
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index e5af237bd2..d9f1679fdf 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -95,7 +95,7 @@ void Cluster::handle(AMQFrame& frame) {
 
 void Cluster::notify() {
     AMQFrame frame(ProtocolVersion(), 0,
-                   new ClusterNotifyBody(ProtocolVersion(), url));
+                   ClusterNotifyBody(ProtocolVersion(), url));
     handle(frame);
 }
 
diff --git a/cpp/src/qpid/cluster/SessionManager.cpp b/cpp/src/qpid/cluster/SessionManager.cpp
index a4efa939fc..b8290ad953 100644
--- a/cpp/src/qpid/cluster/SessionManager.cpp
+++ b/cpp/src/qpid/cluster/SessionManager.cpp
@@ -36,7 +36,7 @@ using namespace sys;
 using namespace broker;
 
 /** Handler to send frames direct to local broker (bypass correlation etc.) */
-    struct BrokerHandler : public FrameHandler, private ChannelAdapter, private DeliveryAdapter {
+struct BrokerHandler : public FrameHandler, private ChannelAdapter, private DeliveryAdapter {
     Connection connection;
     Channel channel;
     BrokerAdapter adapter;
@@ -61,13 +61,13 @@ using namespace broker;
     }
 
     // Dummy methods.
-    virtual void handleHeader(boost::shared_ptr<AMQHeaderBody>){}
-    virtual void handleContent(boost::shared_ptr<AMQContentBody>){}
-    virtual void handleHeartbeat(boost::shared_ptr<AMQHeartbeatBody>){}
+    virtual void handleHeader(AMQHeaderBody*){}
+    virtual void handleContent(AMQContentBody*){}
+    virtual void handleHeartbeat(AMQHeartbeatBody*){}
     virtual bool isOpen() const{ return true; }
-    virtual void handleMethod(shared_ptr<AMQMethodBody>){}
+    virtual void handleMethod(AMQMethodBody*){}
     // No-op send.
-        virtual void send(shared_ptr<AMQBody>) {}
+    virtual void send(const AMQBody&) {}
 
     //delivery adapter methods, also no-ops:
     virtual DeliveryId deliver(Message::shared_ptr&, DeliveryToken::shared_ptr) { return 0; }