Attachment 309115 Details for Bug 451011 – Option 2: change to qpid

Option 2: change to qpid

BZ451011_OPTION2_PART1.patch (text/x-patch), 3.03 KB, created by Gordon Sim on 2008-06-12 18:02:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gordon Sim

Created: 2008-06-12 18:02:42 UTC

Size: 3.03 KB

patch

obsolete

>Index: src/qpid/broker/NullMessageStore.h
>===================================================================
>--- src/qpid/broker/NullMessageStore.h	(revision 666996)
>+++ src/qpid/broker/NullMessageStore.h	(working copy)
>@@ -74,6 +74,7 @@
>                          const PersistableQueue& queue);
>     virtual u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
>     virtual void flush(const qpid::broker::PersistableQueue& queue);
>+    virtual void routed(boost::intrusive_ptr<PersistableMessage>& msg);
>     ~NullMessageStore(){}
> };
> 
>Index: src/qpid/broker/MessageStore.h
>===================================================================
>--- src/qpid/broker/MessageStore.h	(revision 666996)
>+++ src/qpid/broker/MessageStore.h	(working copy)
>@@ -176,6 +176,12 @@
>                          const PersistableQueue& queue) = 0;
> 
>     /**
>+     *Informs the store that a message is routed and no more enqueues
>+     *will be required.
>+     */
>+    virtual void routed(boost::intrusive_ptr<PersistableMessage>& msg) = 0;
>+
>+    /**
>      * Flushes all async messages to disk for the specified queue
>      *
>      * Note: that this is async so the return of the function does
>Index: src/qpid/broker/NullMessageStore.cpp
>===================================================================
>--- src/qpid/broker/NullMessageStore.cpp	(revision 666996)
>+++ src/qpid/broker/NullMessageStore.cpp	(working copy)
>@@ -162,3 +162,5 @@
> {
>     out.insert(prepared.begin(), prepared.end());
> }
>+
>+void NullMessageStore::routed(intrusive_ptr<PersistableMessage>&) {}
>Index: src/qpid/broker/MessageStoreModule.h
>===================================================================
>--- src/qpid/broker/MessageStoreModule.h	(revision 666996)
>+++ src/qpid/broker/MessageStoreModule.h	(working copy)
>@@ -73,7 +73,7 @@
>                  const PersistableQueue& queue);
>     u_int32_t outstandingQueueAIO(const PersistableQueue& queue);
>     void flush(const qpid::broker::PersistableQueue& queue);
>-	 
>+    virtual void routed(boost::intrusive_ptr<PersistableMessage>& msg);	 
>     ~MessageStoreModule();
> };
> 
>Index: src/qpid/broker/SemanticState.cpp
>===================================================================
>--- src/qpid/broker/SemanticState.cpp	(revision 666996)
>+++ src/qpid/broker/SemanticState.cpp	(working copy)
>@@ -345,6 +345,10 @@
>     } else {
>         DeliverableMessage deliverable(msg);
>         route(msg, deliverable);
>+        if (msg->isPersistent()) {
>+            boost::intrusive_ptr<PersistableMessage> pmsg = boost::static_pointer_cast<PersistableMessage>(msg);
>+            session.getBroker().getStore().routed(pmsg);
>+        }
>     }
> }
> 
>Index: src/qpid/broker/MessageStoreModule.cpp
>===================================================================
>--- src/qpid/broker/MessageStoreModule.cpp	(revision 666996)
>+++ src/qpid/broker/MessageStoreModule.cpp	(working copy)
>@@ -155,3 +155,8 @@
> {
>     TRANSFER_EXCEPTION(store->collectPreparedXids(xids));
> }
>+
>+void MessageStoreModule::routed(intrusive_ptr<PersistableMessage>& m)
>+{
>+    TRANSFER_EXCEPTION(store->routed(m));
>+}

Actions: View

Attachments on bug 451011: 309111 | 309115 | 309116 | 309139