QPID-4905: Tidy up

- Remove unused function getBuffered() of ConnectionOutputHandler
- Stop SessionContext and AggregateOutput from needlessly implementing
  the OutputControl interface

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1489457 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 17 insertions, 46 deletions

diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/cpp/src/qpid/amqp_0_10/Connection.cpp
index 5312c40f2a..bb30ece285 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.cpp
+++ b/cpp/src/qpid/amqp_0_10/Connection.cpp
@@ -145,9 +145,4 @@ framing::ProtocolVersion Connection::getVersion() const {
     return version;
 }
 
-size_t Connection::getBuffered() const {
-    Mutex::ScopedLock l(frameQueueLock);
-    return buffered;
-}
-
 }} // namespace qpid::amqp_0_10
diff --git a/cpp/src/qpid/amqp_0_10/Connection.h b/cpp/src/qpid/amqp_0_10/Connection.h
index 92ae5a3dd3..44c4c87ebd 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.h
+++ b/cpp/src/qpid/amqp_0_10/Connection.h
@@ -70,7 +70,6 @@ class Connection  : public sys::ConnectionCodec,
     void close();               // closing from this end.
     void send(framing::AMQFrame&);
     framing::ProtocolVersion getVersion() const;
-    size_t getBuffered() const;
 };
 
 }} // namespace qpid::amqp_0_10
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index df1a23f882..dc55dce6bb 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -479,7 +479,6 @@ bool Connection::isOpen() { return adapter.isOpen(); }
 
 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)
diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index 5c4d7132be..ccf10176c1 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -188,7 +188,6 @@ class Connection : public sys::ConnectionInputHandler,
       public:
         OutboundFrameTracker(Connection&);
         void close();
-        size_t getBuffered() const;
         void abort();
         void activateOutput();
         void send(framing::AMQFrame&);
diff --git a/cpp/src/qpid/broker/ConnectionState.h b/cpp/src/qpid/broker/ConnectionState.h
index a8d6e82210..763e3f3afe 100644
--- a/cpp/src/qpid/broker/ConnectionState.h
+++ b/cpp/src/qpid/broker/ConnectionState.h
@@ -46,7 +46,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable
     ConnectionState(qpid::sys::ConnectionOutputHandler* o, Broker& b) :
         out(o),
         broker(b),
-        outputTasks(out),
         framemax(65535),
         heartbeat(0),
         heartbeatmax(120),
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 275886c6e3..1c74ff7325 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -506,7 +506,7 @@ void SemanticStateConsumerImpl::requestDispatch()
 {
     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()
diff --git a/cpp/src/qpid/broker/SessionContext.h b/cpp/src/qpid/broker/SessionContext.h
index ee98da1878..8134eba041 100644
--- a/cpp/src/qpid/broker/SessionContext.h
+++ b/cpp/src/qpid/broker/SessionContext.h
@@ -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(){}
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index cd8ecfc476..a89e5ef974 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -133,16 +133,6 @@ void SessionState::attach(SessionHandler& h) {
     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;
diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h
index a531ec9fc6..269bba9f6e 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/cpp/src/qpid/broker/SessionState.h
@@ -96,10 +96,6 @@ class SessionState : public qpid::SessionState,
 
     void setTimeout(uint32_t seconds);
 
-    /** OutputControl **/
-    void abort();
-    void activateOutput();
-
     void senderCompleted(const framing::SequenceSet& ranges);
 
     void sendCompletion();
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/cpp/src/qpid/sys/AggregateOutput.cpp
index ebc5689ce5..773ea68e55 100644
--- a/cpp/src/qpid/sys/AggregateOutput.cpp
+++ b/cpp/src/qpid/sys/AggregateOutput.cpp
@@ -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.
diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/cpp/src/qpid/sys/AggregateOutput.h
index e9dbd5a4cc..c8dd8d989a 100644
--- a/cpp/src/qpid/sys/AggregateOutput.h
+++ b/cpp/src/qpid/sys/AggregateOutput.h
@@ -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 AggregateOutput : public OutputTask, public Outpu
     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.
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/cpp/src/qpid/sys/ConnectionOutputHandler.h
index 421dd7c269..74ac8882f0 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandler.h
@@ -34,7 +34,6 @@ class ConnectionOutputHandler : public virtual qpid::framing::OutputHandler, pub
 {
   public:
     virtual void close() = 0;
-    virtual size_t getBuffered() const { return 0; }
 };
 
 }}
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
index 53d56ad716..4a891ec62f 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
@@ -42,7 +42,6 @@ class ConnectionOutputHandlerPtr : public ConnectionOutputHandler
     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); }