qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astitc...@apache.org
Subject svn commit: r1491585 - in /qpid/trunk/qpid/cpp/src: ./ qpid/broker/ qpid/client/ qpid/sys/
Date Mon, 10 Jun 2013 19:47:11 GMT
Author: astitcher
Date: Mon Jun 10 19:47:10 2013
New Revision: 1491585

URL: http://svn.apache.org/r1491585
Log:
QPID-4905: Removed TimeoutHandler interface as it was really unused

Removed:
    qpid/trunk/qpid/cpp/src/qpid/sys/TimeoutHandler.h
Modified:
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
    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/ConnectionImpl.h
    qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1491585&r1=1491584&r2=1491585&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Jun 10 19:47:10 2013
@@ -514,7 +514,6 @@ libqpidcommon_la_SOURCES +=			\
   qpid/sys/Socket.h				\
   qpid/sys/SocketAddress.h			\
   qpid/sys/StateMonitor.h			\
-  qpid/sys/TimeoutHandler.h			\
   qpid/sys/Timer.cpp				\
   qpid/sys/Timer.h				\
   qpid/sys/TimerWarnings.cpp			\

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1491585&r1=1491584&r2=1491585&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Mon Jun 10 19:47:10 2013
@@ -79,7 +79,6 @@
 #include "qpid/sys/Timer.h"
 #include "qpid/sys/ConnectionInputHandler.h"
 #include "qpid/sys/ConnectionInputHandlerFactory.h"
-#include "qpid/sys/TimeoutHandler.h"
 #include "qpid/sys/SystemInfo.h"
 #include "qpid/Address.h"
 #include "qpid/StringUtils.h"

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=1491585&r1=1491584&r2=1491585&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:47:10 2013
@@ -289,10 +289,6 @@ void Connection::close(connection::Close
     getOutput().close();
 }
 
-void Connection::idleOut(){}
-
-void Connection::idleIn(){}
-
 void Connection::closed(){ // Physically closed, suspend open sessions.
     if (heartbeatTimer)
         heartbeatTimer->cancel();

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=1491585&r1=1491584&r2=1491585&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:47:10 2013
@@ -85,8 +85,6 @@ class Connection : public sys::Connectio
 
     // ConnectionInputHandler methods
     void received(framing::AMQFrame& frame);
-    void idleOut();
-    void idleIn();
     bool doOutput();
     void closed();
 

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=1491585&r1=1491584&r2=1491585&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:47:10 2013
@@ -149,16 +149,16 @@ IOThread& theIO() {
 }
 
 class HeartbeatTask : public TimerTask {
-    TimeoutHandler& timeout;
+    ConnectionImpl& timeout;
 
     void fire() {
         // If we ever get here then we have timed out
         QPID_LOG(debug, "Traffic timeout");
-        timeout.idleIn();
+        timeout.timeout();
     }
 
 public:
-    HeartbeatTask(Duration p, TimeoutHandler& t) :
+    HeartbeatTask(Duration p, ConnectionImpl& t) :
         TimerTask(p,"Heartbeat"),
         timeout(t)
     {}
@@ -304,17 +304,11 @@ void ConnectionImpl::open()
     }
 }
 
-void ConnectionImpl::idleIn()
+void ConnectionImpl::timeout()
 {
     connector->abort();
 }
 
-void ConnectionImpl::idleOut()
-{
-    AMQFrame frame((AMQHeartbeatBody()));
-    connector->handle(frame);
-}
-
 void ConnectionImpl::close()
 {
     if (heartbeatTask) 

Modified: qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h?rev=1491585&r1=1491584&r2=1491585&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/ConnectionImpl.h Mon Jun 10 19:47:10 2013
@@ -28,7 +28,6 @@
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/ShutdownHandler.h"
-#include "qpid/sys/TimeoutHandler.h"
 
 #include <map>
 #include <iosfwd>
@@ -46,7 +45,6 @@ class SessionImpl;
 
 class ConnectionImpl : public Bounds,
                        public framing::FrameHandler,
-                       public sys::TimeoutHandler, 
                        public sys::ShutdownHandler,
                        public boost::enable_shared_from_this<ConnectionImpl>
 {
@@ -69,8 +67,6 @@ class ConnectionImpl : public Bounds,
 
     void incoming(framing::AMQFrame& frame);
     void closed(uint16_t, const std::string&);
-    void idleOut();
-    void idleIn();
     void shutdown();
     void failedConnection();
     void release();
@@ -90,6 +86,7 @@ class ConnectionImpl : public Bounds,
     void addSession(const boost::shared_ptr<SessionImpl>&, uint16_t channel=NEXT_CHANNEL);
         
     void close();
+    void timeout();
     void handle(framing::AMQFrame& frame);
     void erase(uint16_t channel);
     const ConnectionSettings& getNegotiatedSettings();

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h?rev=1491585&r1=1491584&r2=1491585&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h Mon Jun 10 19:47:10 2013
@@ -23,7 +23,6 @@
 
 #include "qpid/framing/InputHandler.h"
 #include "qpid/sys/OutputTask.h"
-#include "qpid/sys/TimeoutHandler.h"
 
 namespace qpid {
 namespace sys {
@@ -38,7 +37,7 @@ namespace sys {
 
     class ConnectionInputHandler :
         public qpid::framing::InputHandler, 
-        public TimeoutHandler, public OutputTask
+        public OutputTask
     {
     public:
 



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


Mime
View raw message