Attachment 701038 Details for Bug 913448 – Patch proposal

[patch] Patch proposal

bz913448.patch (text/plain), 2.18 KB, created by Pavel Moravec on 2013-02-22 08:16:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Moravec

Created: 2013-02-22 08:16:51 UTC

Size: 2.18 KB

patch

obsolete

>diff -rup _qpid-0.18-orig/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp _qpid-0.18-new/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
>--- _qpid-0.18-orig/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp	2013-02-19 13:53:07.548956753 +0100
>+++ _qpid-0.18-new/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp	2013-02-21 14:42:52.442842887 +0100
>@@ -98,13 +98,14 @@ void ReceiverImpl::setCapacity(uint32_t 
>     execute1<SetCapacity>(c);
> }
> 
>-void ReceiverImpl::startFlow(const sys::Mutex::ScopedLock&)
>+void ReceiverImpl::startFlow(const sys::Mutex::ScopedLock&, bool setWindow)
> {
>     if (capacity > 0) {
>         session.messageSetFlowMode(destination, FLOW_MODE_WINDOW);
>         session.messageFlow(destination, CREDIT_UNIT_MESSAGE, capacity);
>         session.messageFlow(destination, CREDIT_UNIT_BYTE, byteCredit);
>-        window = capacity;
>+        if (setWindow)
>+	    window = capacity;
>     }
> }
> 
>@@ -182,7 +183,8 @@ bool ReceiverImpl::fetchImpl(qpid::messa
>         s.messageFlush(destination);
>         {
>             sys::Mutex::ScopedLock l(lock);
>-            startFlow(l); //reallocate credit
>+            startFlow(l, false); //to allocate credit (but not update local widnow counter)
>+            received(message); //to potentially issue message.complete
>         }
>         return getImpl(message, Duration::IMMEDIATE);
>     }
>diff -rup _qpid-0.18-orig/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h _qpid-0.18-new/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
>--- _qpid-0.18-orig/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h	2013-02-19 13:53:07.549956391 +0100
>+++ _qpid-0.18-new/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h	2013-02-22 08:08:47.989706545 +0100
>@@ -80,7 +80,7 @@ class ReceiverImpl : public qpid::messag
>     qpid::client::AsyncSession session;
>     uint32_t window;
> 
>-    void startFlow(const sys::Mutex::ScopedLock&); // Dummy param, call with lock held
>+    void startFlow(const sys::Mutex::ScopedLock&, bool setWindow = true); // Lock is a dummy param, call with lock held
>     //implementation of public facing methods
>     bool fetchImpl(qpid::messaging::Message& message, qpid::messaging::Duration timeout);
>     bool getImpl(qpid::messaging::Message& message, qpid::messaging::Duration timeout);

Actions: View | Diff

Attachments on bug 913448: 700414 | 701038