QPID-4905: Tidy up broker::Connection

- Clean up code for accounting for sent frames
- merged Connection and ConnectionState into Connection

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

1 files changed, 9 insertions, 8 deletions

diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index a42ed883a9..54069df591 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -42,6 +42,7 @@
 #include "qpid/ptr_map.h"
 #include "qpid/broker/AclModule.h"
 #include "qpid/broker/FedOps.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
 
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
@@ -439,7 +440,7 @@ void SemanticState::disable(ConsumerImpl::shared_ptr c)
 {
     c->disableNotify();
     if (session.isAttached())
-        session.getConnection().outputTasks.removeOutputTask(c.get());
+        session.getConnection().removeOutputTask(c.get());
 }
 
 void SemanticState::cancel(ConsumerImpl::shared_ptr c)
@@ -505,8 +506,8 @@ void SemanticState::requestDispatch()
 void SemanticStateConsumerImpl::requestDispatch()
 {
     if (blocked) {
-        parent->session.getConnection().outputTasks.addOutputTask(this);
-        parent->session.getConnection().getOutput().activateOutput();
+        parent->session.getConnection().addOutputTask(this);
+        parent->session.getConnection().activateOutput();
         blocked = false;
     }
 }
@@ -735,8 +736,8 @@ void SemanticStateConsumerImpl::notify()
 {
     Mutex::ScopedLock l(lock);
     if (notifyEnabled) {
-        parent->session.getConnection().outputTasks.addOutputTask(this);
-        parent->session.getConnection().getOutput().activateOutput();
+        parent->session.getConnection().addOutputTask(this);
+        parent->session.getConnection().activateOutput();
     }
 }
 
@@ -804,16 +805,16 @@ void SemanticState::attached()
 {
     for (ConsumerImplMap::iterator i = consumers.begin(); i != consumers.end(); i++) {
         i->second->enableNotify();
-        session.getConnection().outputTasks.addOutputTask(i->second.get());
+        session.getConnection().addOutputTask(i->second.get());
     }
-    session.getConnection().getOutput().activateOutput();
+    session.getConnection().activateOutput();
 }
 
 void SemanticState::detached()
 {
     for (ConsumerImplMap::iterator i = consumers.begin(); i != consumers.end(); i++) {
         i->second->disableNotify();
-        session.getConnection().outputTasks.removeOutputTask(i->second.get());
+        session.getConnection().removeOutputTask(i->second.get());
     }
 }