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/07/09 15:12:03 UTC
svn commit: r675155 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/broker:
SemanticState.cpp SemanticState.h
Author: aconway
Date: Wed Jul 9 06:12:03 2008
New Revision: 675155
URL: http://svn.apache.org/viewvc?rev=675155&view=rev
Log:
Removed dead code.
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=675155&r1=675154&r2=675155&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Wed Jul 9 06:12:03 2008
@@ -62,7 +62,6 @@
prefetchCount(0),
tagGenerator("sgen"),
dtxSelected(false),
- flowActive(true),
outputTasks(ss)
{
outstanding.reset();
@@ -288,7 +287,7 @@
bool SemanticState::ConsumerImpl::accept(intrusive_ptr<Message> msg)
{
- blocked = !(filter(msg) && checkCredit(msg) && parent->flowActive && (!ackExpected || parent->checkPrefetch(msg)));
+ blocked = !(filter(msg) && checkCredit(msg) && (!ackExpected || parent->checkPrefetch(msg)));
return !blocked;
}
@@ -443,17 +442,6 @@
return deliveryAdapter.deliver(msg, token);
}
-void SemanticState::flow(bool active)
-{
- bool requestDelivery(!flowActive && active);
- flowActive = active;
- if (requestDelivery) {
- //there may be messages that can be now be delivered
- requestDispatch();
- }
-}
-
-
SemanticState::ConsumerImpl& SemanticState::find(const std::string& destination)
{
ConsumerImplMap::iterator i = consumers.find(destination);
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h?rev=675155&r1=675154&r2=675155&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h Wed Jul 9 06:12:03 2008
@@ -115,7 +115,6 @@
bool dtxSelected;
DtxBufferMap suspendedXids;
framing::SequenceSet accumulatedAck;
- bool flowActive;
boost::shared_ptr<Exchange> cacheExchange;
sys::AggregateOutput outputTasks;
@@ -174,7 +173,6 @@
void suspendDtx(const std::string& xid);
void resumeDtx(const std::string& xid);
void recover(bool requeue);
- void flow(bool active);
DeliveryId redeliver(QueuedMessage& msg, DeliveryToken::shared_ptr token);
void acquire(DeliveryId first, DeliveryId last, DeliveryIds& acquired);
void release(DeliveryId first, DeliveryId last, bool setRedelivered);