Author: astitcher
Date: Tue Jun 4 14:27:40 2013
New Revision: 1489457
URL: http://svn.apache.org/r1489457
Log:
QPID-4905: Tidy up
- Remove unused function getBuffered() of ConnectionOutputHandler
- Stop SessionContext and AggregateOutput from needlessly implementing
the OutputControl interface
Modified:
qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.h
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h
qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h
qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h
qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp Tue Jun 4 14:27:40
2013
@@ -145,9 +145,4 @@ framing::ProtocolVersion Connection::get
return version;
}
-size_t Connection::getBuffered() const {
- Mutex::ScopedLock l(frameQueueLock);
- return buffered;
-}
-
}} // namespace qpid::amqp_0_10
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.h Tue Jun 4 14:27:40 2013
@@ -70,7 +70,6 @@ class Connection : public sys::Connecti
void close(); // closing from this end.
void send(framing::AMQFrame&);
framing::ProtocolVersion getVersion() const;
- size_t getBuffered() const;
};
}} // namespace qpid::amqp_0_10
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Tue Jun 4 14:27:40 2013
@@ -479,7 +479,6 @@ bool Connection::isOpen() { return adapt
Connection::OutboundFrameTracker::OutboundFrameTracker(Connection& _con) :
con(_con), next(0) {}
void Connection::OutboundFrameTracker::close() { next->close(); }
-size_t Connection::OutboundFrameTracker::getBuffered() const { return
next->getBuffered(); }
void Connection::OutboundFrameTracker::abort() { next->abort(); }
void Connection::OutboundFrameTracker::activateOutput() {
next->activateOutput(); }
void Connection::OutboundFrameTracker::send(framing::AMQFrame& f)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h Tue Jun 4 14:27:40 2013
@@ -188,7 +188,6 @@ class Connection : public sys::Connectio
public:
OutboundFrameTracker(Connection&);
void close();
- size_t getBuffered() const;
void abort();
void activateOutput();
void send(framing::AMQFrame&);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h Tue Jun 4 14:27:40
2013
@@ -46,7 +46,6 @@ class ConnectionState : public Connectio
ConnectionState(qpid::sys::ConnectionOutputHandler* o, Broker& b) :
out(o),
broker(b),
- outputTasks(out),
framemax(65535),
heartbeat(0),
heartbeatmax(120),
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.cpp Tue Jun 4 14:27:40
2013
@@ -506,7 +506,7 @@ void SemanticStateConsumerImpl::requestD
{
if (blocked) {
parent->session.getConnection().outputTasks.addOutputTask(this);
- parent->session.getConnection().outputTasks.activateOutput();
+ parent->session.getConnection().getOutput().activateOutput();
blocked = false;
}
}
@@ -736,7 +736,7 @@ void SemanticStateConsumerImpl::notify()
Mutex::ScopedLock l(lock);
if (notifyEnabled) {
parent->session.getConnection().outputTasks.addOutputTask(this);
- parent->session.getConnection().outputTasks.activateOutput();
+ parent->session.getConnection().getOutput().activateOutput();
}
}
@@ -806,7 +806,7 @@ void SemanticState::attached()
i->second->enableNotify();
session.getConnection().outputTasks.addOutputTask(i->second.get());
}
- session.getConnection().outputTasks.activateOutput();
+ session.getConnection().getOutput().activateOutput();
}
void SemanticState::detached()
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionContext.h Tue Jun 4 14:27:40
2013
@@ -22,20 +22,23 @@
*
*/
-#include "qpid/framing/FrameHandler.h"
-#include "qpid/framing/AMQP_ClientProxy.h"
-#include "qpid/framing/amqp_types.h"
-#include "qpid/sys/OutputControl.h"
-#include "qpid/broker/ConnectionState.h"
#include "qpid/broker/OwnershipToken.h"
-#include "qpid/SessionId.h"
#include <boost/noncopyable.hpp>
namespace qpid {
+
+class SessionId;
+
+namespace framing {
+class AMQP_ClientProxy;
+}
namespace broker {
-class SessionContext : public OwnershipToken, public sys::OutputControl
+class Broker;
+class ConnectionState;
+
+class SessionContext : public OwnershipToken
{
public:
virtual ~SessionContext(){}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Tue Jun 4 14:27:40
2013
@@ -133,16 +133,6 @@ void SessionState::attach(SessionHandler
asyncCommandCompleter->attached();
}
-void SessionState::abort() {
- if (isAttached())
- getConnection().outputTasks.abort();
-}
-
-void SessionState::activateOutput() {
- if (isAttached())
- getConnection().outputTasks.activateOutput();
-}
-
ManagementObject::shared_ptr SessionState::GetManagementObject(void) const
{
return mgmtObject;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h Tue Jun 4 14:27:40 2013
@@ -96,10 +96,6 @@ class SessionState : public qpid::Sessio
void setTimeout(uint32_t seconds);
- /** OutputControl **/
- void abort();
- void activateOutput();
-
void senderCompleted(const framing::SequenceSet& ranges);
void sendCompletion();
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.cpp?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.cpp Tue Jun 4 14:27:40
2013
@@ -26,11 +26,7 @@
namespace qpid {
namespace sys {
-AggregateOutput::AggregateOutput(OutputControl& c) : busy(false), control(c) {}
-
-void AggregateOutput::abort() { control.abort(); }
-
-void AggregateOutput::activateOutput() { control.activateOutput(); }
+AggregateOutput::AggregateOutput() : busy(false) {}
namespace {
// Clear the busy flag and notify waiting threads in destructor.
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h Tue Jun 4 14:27:40 2013
@@ -22,8 +22,8 @@
#define _AggregateOutput_
#include "qpid/sys/Monitor.h"
-#include "qpid/sys/OutputControl.h"
#include "qpid/sys/OutputTask.h"
+
#include "qpid/CommonImportExport.h"
#include <algorithm>
@@ -42,7 +42,7 @@ namespace sys {
* doOutput is called in another.
*/
-class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask, public
OutputControl
+class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask
{
typedef std::deque<OutputTask*> TaskList;
typedef std::set<OutputTask*> TaskSet;
@@ -51,14 +51,11 @@ class QPID_COMMON_CLASS_EXTERN Aggregate
TaskList tasks;
TaskSet taskSet;
bool busy;
- OutputControl& control;
public:
- QPID_COMMON_EXTERN AggregateOutput(OutputControl& c);
+ QPID_COMMON_EXTERN AggregateOutput();
// These may be called concurrently with any function.
- QPID_COMMON_EXTERN void abort();
- QPID_COMMON_EXTERN void activateOutput();
QPID_COMMON_EXTERN void addOutputTask(OutputTask* t);
// These functions must not be called concurrently with each other.
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h Tue Jun 4
14:27:40 2013
@@ -34,7 +34,6 @@ class ConnectionOutputHandler : public v
{
public:
virtual void close() = 0;
- virtual size_t getBuffered() const { return 0; }
};
}}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h?rev=1489457&r1=1489456&r2=1489457&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h Tue Jun 4
14:27:40 2013
@@ -42,7 +42,6 @@ class ConnectionOutputHandlerPtr : publi
const ConnectionOutputHandler* get() const { return next; }
void close() { next->close(); }
- size_t getBuffered() const { return next->getBuffered(); }
void abort() { next->abort(); }
void activateOutput() { next->activateOutput(); }
void send(framing::AMQFrame& f) { next->send(f); }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
