From 2da54e759e2a1f04bd0c21f116a44b4e3944ba89 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 10 Jun 2013 19:47:10 +0000 Subject: QPID-4905: Removed TimeoutHandler interface as it was really unused git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1491585 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/Makefile.am | 1 - cpp/src/qpid/broker/Broker.cpp | 1 - cpp/src/qpid/broker/Connection.cpp | 4 ---- cpp/src/qpid/broker/Connection.h | 2 -- cpp/src/qpid/client/ConnectionImpl.cpp | 14 ++++------- cpp/src/qpid/client/ConnectionImpl.h | 5 +--- cpp/src/qpid/sys/ConnectionInputHandler.h | 3 +-- cpp/src/qpid/sys/TimeoutHandler.h | 39 ------------------------------- 8 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 cpp/src/qpid/sys/TimeoutHandler.h diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index ae7f90f1d5..3dc02da03a 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -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 \ diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 8a7b8c106c..518f599986 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -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" diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp index 0165c31750..6bf7282a95 100644 --- a/cpp/src/qpid/broker/Connection.cpp +++ b/cpp/src/qpid/broker/Connection.cpp @@ -289,10 +289,6 @@ void Connection::close(connection::CloseCode code, const string& text) getOutput().close(); } -void Connection::idleOut(){} - -void Connection::idleIn(){} - void Connection::closed(){ // Physically closed, suspend open sessions. if (heartbeatTimer) heartbeatTimer->cancel(); diff --git a/cpp/src/qpid/broker/Connection.h b/cpp/src/qpid/broker/Connection.h index 8b9db7f636..a5446a72d8 100644 --- a/cpp/src/qpid/broker/Connection.h +++ b/cpp/src/qpid/broker/Connection.h @@ -85,8 +85,6 @@ class Connection : public sys::ConnectionInputHandler, // ConnectionInputHandler methods void received(framing::AMQFrame& frame); - void idleOut(); - void idleIn(); bool doOutput(); void closed(); diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp index dbb0a67d22..056a53f263 100644 --- a/cpp/src/qpid/client/ConnectionImpl.cpp +++ b/cpp/src/qpid/client/ConnectionImpl.cpp @@ -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) diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/cpp/src/qpid/client/ConnectionImpl.h index cc81500b18..b07ce142fb 100644 --- a/cpp/src/qpid/client/ConnectionImpl.h +++ b/cpp/src/qpid/client/ConnectionImpl.h @@ -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 #include @@ -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 { @@ -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&, uint16_t channel=NEXT_CHANNEL); void close(); + void timeout(); void handle(framing::AMQFrame& frame); void erase(uint16_t channel); const ConnectionSettings& getNegotiatedSettings(); diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/cpp/src/qpid/sys/ConnectionInputHandler.h index 92de808308..f6fcdb7479 100644 --- a/cpp/src/qpid/sys/ConnectionInputHandler.h +++ b/cpp/src/qpid/sys/ConnectionInputHandler.h @@ -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: diff --git a/cpp/src/qpid/sys/TimeoutHandler.h b/cpp/src/qpid/sys/TimeoutHandler.h deleted file mode 100644 index 0c10709bbf..0000000000 --- a/cpp/src/qpid/sys/TimeoutHandler.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -#ifndef _TimeoutHandler_ -#define _TimeoutHandler_ - -namespace qpid { -namespace sys { - - class TimeoutHandler - { - public: - virtual void idleOut() = 0; - virtual void idleIn() = 0; - virtual ~TimeoutHandler(){} - }; - -} -} - - -#endif -- cgit v1.2.1