Fix for the most disruptive items in QPID-243.

* All #include lines now use '""' rather than '<>' where appropriate.
* #include lines within the qpid project use relative includes so that
  the same path will work in /usr/include when installed as part of the
  client libraries.
* All the source code has now been rearranged to be under src in a directory
  analogous to the namespace of the classes in it.


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

1 files changed, 87 insertions, 0 deletions

diff --git a/cpp/src/broker/DeliveryRecord.cpp b/cpp/src/broker/DeliveryRecord.cpp
new file mode 100644
index 0000000000..95650b7b23
--- /dev/null
+++ b/cpp/src/broker/DeliveryRecord.cpp
@@ -0,0 +1,87 @@
+/*
+ *
+ * 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 "DeliveryRecord.h"
+#include "BrokerChannel.h"
+
+using namespace qpid::broker;
+using std::string;
+
+DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg, 
+                               Queue::shared_ptr _queue, 
+                               const string _consumerTag, 
+                               const uint64_t _deliveryTag) : msg(_msg), 
+                                                               queue(_queue), 
+                                                               consumerTag(_consumerTag),
+                                                               deliveryTag(_deliveryTag),
+                                                               pull(false){}
+
+DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg, 
+                               Queue::shared_ptr _queue, 
+                               const uint64_t _deliveryTag) : msg(_msg), 
+                                                               queue(_queue), 
+                                                               consumerTag(""),
+                                                               deliveryTag(_deliveryTag),
+                                                               pull(true){}
+
+
+void DeliveryRecord::discard(TransactionContext* ctxt) const{
+    queue->dequeue(ctxt, msg);
+}
+
+bool DeliveryRecord::matches(uint64_t tag) const{
+    return deliveryTag == tag;
+}
+
+bool DeliveryRecord::coveredBy(const AccumulatedAck* const range) const{
+    return range->covers(deliveryTag);
+}
+
+void DeliveryRecord::redeliver(Channel* const channel) const{
+    if(pull){
+        //if message was originally sent as response to get, we must requeue it
+        requeue();
+    }else{
+        channel->deliver(msg, consumerTag, deliveryTag);
+    }
+}
+
+void DeliveryRecord::requeue() const{
+    msg->redeliver();
+    queue->process(msg);
+}
+
+void DeliveryRecord::addTo(Prefetch* const prefetch) const{
+    if(!pull){
+        //ignore 'pulled' messages (i.e. those that were sent in
+        //response to get) when calculating prefetch
+        prefetch->size += msg->contentSize();
+        prefetch->count++;
+    }    
+}
+
+void DeliveryRecord::subtractFrom(Prefetch* const prefetch) const{
+    if(!pull){
+        //ignore 'pulled' messages (i.e. those that were sent in
+        //response to get) when calculating prefetch
+        prefetch->size -= msg->contentSize();
+        prefetch->count--;
+    }
+}