qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1491580 - in /qpid/trunk/qpid/cpp/src: ./ qpid/amqp_0_10/ qpid/broker/ qpid/client/ qpid/framing/ qpid/sys/
Date Mon, 10 Jun 2013 19:46:44 GMT
Author: astitcher
Date: Mon Jun 10 19:46:43 2013
New Revision: 1491580

URL: http://svn.apache.org/r1491580
Log:
QPID-4905: Tidy-up remove OutputHandler and directly use FrameHandler

Removed:
    qpid/trunk/qpid/cpp/src/qpid/framing/OutputHandler.h
Modified:
    qpid/trunk/qpid/cpp/src/Makefile.am
    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/client/ConnectionImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
    qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.h
    qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.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/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Jun 10 19:46:43 2013
@@ -433,7 +433,6 @@ libqpidcommon_la_SOURCES +=			\
   qpid/framing/MethodBodyFactory.h		\
   qpid/framing/MethodContent.h			\
   qpid/framing/ModelMethod.h			\
-  qpid/framing/OutputHandler.h			\
   qpid/framing/ProtocolInitiation.cpp		\
   qpid/framing/ProtocolInitiation.h		\
   qpid/framing/ProtocolVersion.cpp		\

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=1491580&r1=1491579&r2=1491580&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 Mon Jun 10 19:46:43 2013
@@ -132,7 +132,7 @@ void  Connection::closed() {
     connection->closed();
 }
 
-void Connection::send(framing::AMQFrame& f) {
+void Connection::handle(framing::AMQFrame& f) {
     {
         Mutex::ScopedLock l(frameQueueLock);
 	if (!pushClosed)

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=1491580&r1=1491579&r2=1491580&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 Mon Jun 10 19:46:43 2013
@@ -69,7 +69,7 @@ class Connection  : public sys::Connecti
     void activateOutput();
     void closed();              // connection closed by peer.
     void close();               // closing from this end.
-    void send(framing::AMQFrame&);
+    void handle(framing::AMQFrame&);
     framing::ProtocolVersion getVersion() const;
 };
 

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=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.cpp Mon Jun 10 19:46:43 2013
@@ -484,9 +484,9 @@ void Connection::OutboundFrameTracker::c
 void Connection::OutboundFrameTracker::abort() { next->abort(); }
 void Connection::OutboundFrameTracker::connectionEstablished() { next->connectionEstablished();
}
 void Connection::OutboundFrameTracker::activateOutput() { next->activateOutput(); }
-void Connection::OutboundFrameTracker::send(framing::AMQFrame& f)
+void Connection::OutboundFrameTracker::handle(framing::AMQFrame& f)
 {
-    next->send(f);
+    next->handle(f);
     con.sent(f);
 }
 void Connection::OutboundFrameTracker::wrap(sys::ConnectionOutputHandlerPtr& p)

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=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Connection.h Mon Jun 10 19:46:43 2013
@@ -191,7 +191,7 @@ class Connection : public sys::Connectio
         void abort();
         void connectionEstablished();
         void activateOutput();
-        void send(framing::AMQFrame&);
+        void handle(framing::AMQFrame&);
         void wrap(sys::ConnectionOutputHandlerPtr&);
       private:
         Connection& con;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.cpp Mon Jun 10 19:46:43 2013
@@ -192,7 +192,7 @@ ConnectionImpl::ConnectionImpl(framing::
       released(false)
 {
     handler.in = boost::bind(&ConnectionImpl::incoming, this, _1);
-    handler.out = boost::bind(&Connector::send, boost::ref(connector), _1);
+    handler.out = boost::bind(&Connector::handle, boost::ref(connector), _1);
     handler.onClose = boost::bind(&ConnectionImpl::closed, this,
                                   CLOSE_CODE_NORMAL, std::string());
     //only set error handler once  open
@@ -312,7 +312,7 @@ void ConnectionImpl::idleIn()
 void ConnectionImpl::idleOut()
 {
     AMQFrame frame((AMQHeartbeatBody()));
-    connector->send(frame);
+    connector->handle(frame);
 }
 
 void ConnectionImpl::close()

Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connector.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connector.h?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connector.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connector.h Mon Jun 10 19:46:43 2013
@@ -22,7 +22,7 @@
 #define _Connector_
 
 
-#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/ProtocolVersion.h"
 
 #include <boost/shared_ptr.hpp>
@@ -49,7 +49,7 @@ struct ConnectionSettings;
 class ConnectionImpl;
 
 ///@internal
-class Connector : public framing::OutputHandler
+class Connector : public framing::FrameHandler
 {
   public:
     // Protocol connector factory related stuff (it might be better to separate this code
from the TCP Connector in the future)
@@ -64,7 +64,7 @@ class Connector : public framing::Output
     virtual void connect(const std::string& host, const std::string& port) = 0;
     virtual void init() {};
     virtual void close() = 0;
-    virtual void send(framing::AMQFrame& frame) = 0;
+    virtual void handle(framing::AMQFrame& frame) = 0;
     virtual void abort() = 0;
 
     virtual void setInputHandler(framing::InputHandler* handler) = 0;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp Mon Jun 10 19:46:43 2013
@@ -70,7 +70,7 @@ class RdmaConnector : public Connector, 
     sys::ShutdownHandler* shutdownHandler;
     framing::InputHandler* input;
     framing::InitiationHandler* initialiser;
-    framing::OutputHandler* output;
+    framing::FrameHandler* output;
 
     Rdma::AsynchIO* aio;
     Rdma::Connector* acon;
@@ -97,7 +97,7 @@ class RdmaConnector : public Connector, 
 
     void connect(const std::string& host, const std::string& port);
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort() {} // TODO: need to fix this for heartbeat timeouts to work
 
     void setInputHandler(framing::InputHandler* handler);
@@ -312,7 +312,7 @@ const std::string& RdmaConnector::getIde
     return identifier;
 }
 
-void RdmaConnector::send(AMQFrame& frame) {
+void RdmaConnector::handle(AMQFrame& frame) {
     // It is possible that we are called to write after we are already shutting down
     Mutex::ScopedLock l(dataConnectedLock);
     if (!dataConnected) return;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp Mon Jun 10 19:46:43 2013
@@ -92,7 +92,7 @@ class SslConnector : public Connector
     void connectFailed(const std::string& msg);
 
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort();
     void connectAborted();
 
@@ -254,7 +254,7 @@ const std::string& SslConnector::getIden
     return identifier;
 }
 
-void SslConnector::send(AMQFrame& frame) {
+void SslConnector::handle(AMQFrame& frame) {
     bool notifyWrite = false;
     {
     Mutex::ScopedLock l(lock);

Modified: qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp Mon Jun 10 19:46:43 2013
@@ -181,7 +181,7 @@ const std::string& TCPConnector::getIden
     return identifier;
 }
 
-void TCPConnector::send(AMQFrame& frame) {
+void TCPConnector::handle(AMQFrame& frame) {
     bool notifyWrite = false;
     {
     Mutex::ScopedLock l(lock);

Modified: qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.h?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.h Mon Jun 10 19:46:43 2013
@@ -78,7 +78,7 @@ class TCPConnector : public Connector, p
     void writeDataBlock(const framing::AMQDataBlock& data);
 
     void close();
-    void send(framing::AMQFrame& frame);
+    void handle(framing::AMQFrame& frame);
     void abort();
     void connectAborted();
 

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h?rev=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/amqp_framing.h Mon Jun 10 19:46:43 2013
@@ -26,6 +26,5 @@
 #include "qpid/framing/AMQContentBody.h"
 #include "qpid/framing/AMQHeartbeatBody.h"
 #include "qpid/framing/InputHandler.h"
-#include "qpid/framing/OutputHandler.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/framing/ProtocolVersion.h"

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=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h Mon Jun 10 19:46:43 2013
@@ -21,7 +21,7 @@
 #ifndef _ConnectionOutputHandler_
 #define _ConnectionOutputHandler_
 
-#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/OutputControl.h"
 
 namespace qpid {
@@ -30,7 +30,7 @@ namespace sys {
 /**
  * Provides the output handler associated with a connection.
  */
-class ConnectionOutputHandler : public virtual qpid::framing::OutputHandler, public OutputControl
+class ConnectionOutputHandler : public virtual qpid::framing::FrameHandler, public OutputControl
 {
   public:
     virtual void close() = 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=1491580&r1=1491579&r2=1491580&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h Mon Jun 10 19:46:43 2013
@@ -45,7 +45,7 @@ class ConnectionOutputHandlerPtr : publi
     void abort() { next->abort(); }
     void connectionEstablished() { next->connectionEstablished(); }
     void activateOutput() { next->activateOutput(); }
-    void send(framing::AMQFrame& f) { next->send(f); }
+    void handle(framing::AMQFrame& f) { next->handle(f); }
 
   private:
     ConnectionOutputHandler* next;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message