You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2008/11/11 22:09:24 UTC
svn commit: r713171 - in /incubator/qpid/trunk/qpid/cpp:
src/qpid/broker/DeliveryRecord.cpp src/qpid/broker/DeliveryRecord.h
src/qpid/cluster/Connection.cpp src/qpid/cluster/Connection.h
src/qpid/cluster/DumpClient.cpp xml/cluster.xml
Author: aconway
Date: Tue Nov 11 13:09:21 2008
New Revision: 713171
URL: http://svn.apache.org/viewvc?rev=713171&view=rev
Log:
Include DeliveryRecord::credit in replication to new members.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/DumpClient.cpp
incubator/qpid/trunk/qpid/cpp/xml/cluster.xml
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp Tue Nov 11 13:09:21 2008
@@ -35,7 +35,8 @@
const std::string& _tag,
bool _acquired,
bool accepted,
- bool _windowing) : msg(_msg),
+ bool _windowing,
+ uint32_t _credit) : msg(_msg),
queue(_queue),
tag(_tag),
acquired(_acquired),
@@ -44,7 +45,7 @@
completed(false),
ended(accepted),
windowing(_windowing),
- credit(msg.payload ? msg.payload->getRequiredCredit() : 0)
+ credit(msg.payload ? msg.payload->getRequiredCredit() : _credit)
{}
void DeliveryRecord::setEnded()
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h Tue Nov 11 13:09:21 2008
@@ -80,7 +80,8 @@
const std::string& tag,
bool acquired,
bool accepted,
- bool windowing
+ bool windowing,
+ uint32_t credit=0 // Only used if msg is empty.
);
bool matches(DeliveryId tag) const;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Tue Nov 11 13:09:21 2008
@@ -280,7 +280,8 @@
bool cancelled,
bool completed,
bool ended,
- bool windowing)
+ bool windowing,
+ uint32_t credit)
{
broker::QueuedMessage m;
broker::Queue::shared_ptr queue = findQueue(qname);
@@ -293,7 +294,7 @@
throw Exception(QPID_MSG("deliveryRecord no dump message"));
}
- broker::DeliveryRecord dr(m, queue, tag, acquired, accepted, windowing);
+ broker::DeliveryRecord dr(m, queue, tag, acquired, accepted, windowing, credit);
dr.setId(id);
if (cancelled) dr.cancel(dr.getTag());
if (completed) dr.complete();
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h Tue Nov 11 13:09:21 2008
@@ -124,7 +124,8 @@
bool cancelled,
bool completed,
bool ended,
- bool windowing);
+ bool windowing,
+ uint32_t credit);
void queuePosition(const std::string&, const framing::SequenceNumber&);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/DumpClient.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/DumpClient.cpp?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/DumpClient.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/DumpClient.cpp Tue Nov 11 13:09:21 2008
@@ -308,7 +308,9 @@
dr.isCancelled(),
dr.isComplete(),
dr.isEnded(),
- dr.isWindowing());
+ dr.isWindowing(),
+ dr.getCredit()
+ );
}
class TxOpDumper : public broker::TxOpConstVisitor, public MessageDumper {
Modified: incubator/qpid/trunk/qpid/cpp/xml/cluster.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/xml/cluster.xml?rev=713171&r1=713170&r2=713171&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/xml/cluster.xml (original)
+++ incubator/qpid/trunk/qpid/cpp/xml/cluster.xml Tue Nov 11 13:09:21 2008
@@ -94,6 +94,7 @@
<field name="completed" type="bit"/>
<field name="ended" type="bit"/>
<field name="windowing" type="bit"/>
+ <field name="credit" type="uint32"/>
</control>
<!-- Tx transaction state. -->