Added framing::BodyHolder:

 - Uniform holder for all body types, replaces MethodHolder.
 - Uses in_place constructors to avoid avoid body copy.

framing::AMQFrame:
 - Holds body in heap-allocated intrusive_ptr<BodyHolder>
 - Uses in_place constructors to avoid avoid body copy.

Removed/downgraded to TODO many redundant FIXME comments.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@597513 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 75 insertions, 0 deletions

diff --git a/cpp/src/qpid/framing/BodyHolder.cpp b/cpp/src/qpid/framing/BodyHolder.cpp
new file mode 100644
index 0000000000..f66f29d36a
--- /dev/null
+++ b/cpp/src/qpid/framing/BodyHolder.cpp
@@ -0,0 +1,75 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "BodyHolder.h"
+#include "AMQMethodBody.h"
+#include "AMQHeaderBody.h"
+#include "AMQContentBody.h"
+#include "AMQHeartbeatBody.h"
+#include "Buffer.h"
+#include "qpid/framing/reply_exceptions.h"
+
+namespace qpid {
+namespace framing {
+
+
+// BodyHolder::operator=(const AMQBody&)  is defined
+// in generated file BodyHolder_gen.cpp
+
+
+void BodyHolder::encode(Buffer& b) const {
+    const AMQMethodBody* method=getMethod();
+    if (method) {
+        b.putOctet(method->amqpClassId());
+        b.putOctet(method->amqpMethodId());
+        method->encode(b);
+    }
+    else
+        get()->encode(b);
+}
+
+void BodyHolder::decode(uint8_t type, Buffer& buffer, uint32_t size) {
+    switch(type)
+    {
+      case METHOD_BODY: {
+          ClassId c = buffer.getOctet();
+          MethodId m = buffer.getOctet();
+          setMethod(c, m);
+          break;
+      }
+      case HEADER_BODY: *this=in_place<AMQHeaderBody>(); break;
+      case CONTENT_BODY: *this=in_place<AMQContentBody>(); break;
+      case HEARTBEAT_BODY: *this=in_place<AMQHeartbeatBody>(); break;
+      default:
+	throw SyntaxErrorException(QPID_MSG("Invalid frame type " << type));
+    }
+    get()->decode(buffer, size);
+}
+
+uint32_t BodyHolder::size() const {
+    const AMQMethodBody* method=getMethod();
+    if (method) 
+        return sizeof(ClassId)+sizeof(MethodId)+method->size();
+    else
+        return get()->size();
+}
+
+}} // namespace qpid::framing
+