From 4f58af64f169752ea16d3164cbf1320c85a0ea2e Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 8 Sep 2010 16:48:41 +0000 Subject: Stop using references to intrusive_ptr in Rdma code git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@995127 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/RdmaIOPlugin.cpp | 28 ++++++++++++++-------------- cpp/src/qpid/sys/rdma/RdmaIO.h | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'cpp/src/qpid/sys') diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/cpp/src/qpid/sys/RdmaIOPlugin.cpp index 044e6b465b..7c2dc77caa 100644 --- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp +++ b/cpp/src/qpid/sys/RdmaIOPlugin.cpp @@ -54,7 +54,7 @@ class RdmaIOHandler : public OutputControl { void write(const framing::ProtocolInitiation&); public: - RdmaIOHandler(Rdma::Connection::intrusive_ptr& c, ConnectionCodec::Factory* f); + RdmaIOHandler(Rdma::Connection::intrusive_ptr c, ConnectionCodec::Factory* f); ~RdmaIOHandler(); void init(Rdma::AsynchIO* a); void start(Poller::shared_ptr poller) {aio->start(poller);} @@ -77,7 +77,7 @@ class RdmaIOHandler : public OutputControl { void drained(Rdma::AsynchIO& aio); }; -RdmaIOHandler::RdmaIOHandler(Rdma::Connection::intrusive_ptr& c, qpid::sys::ConnectionCodec::Factory* f) : +RdmaIOHandler::RdmaIOHandler(Rdma::Connection::intrusive_ptr c, qpid::sys::ConnectionCodec::Factory* f) : connection(c), identifier(c->getPeerName()), factory(f), @@ -223,12 +223,12 @@ class RdmaIOProtocolFactory : public ProtocolFactory { string getHost() const; private: - bool request(Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&, ConnectionCodec::Factory*); - void established(Poller::shared_ptr, Rdma::Connection::intrusive_ptr&); - void connected(Poller::shared_ptr, Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&, ConnectionCodec::Factory*); - void connectionError(Rdma::Connection::intrusive_ptr&, Rdma::ErrorType); - void disconnected(Rdma::Connection::intrusive_ptr&); - void rejected(Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&, ConnectFailedCallback); + bool request(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*); + void established(Poller::shared_ptr, Rdma::Connection::intrusive_ptr); + void connected(Poller::shared_ptr, Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectionCodec::Factory*); + void connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType); + void disconnected(Rdma::Connection::intrusive_ptr); + void rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback); }; // Static instance to initialise plugin @@ -258,12 +258,12 @@ RdmaIOProtocolFactory::RdmaIOProtocolFactory(int16_t port, int /*backlog*/) : listeningPort(port) {} -void RdmaIOProtocolFactory::established(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci) { +void RdmaIOProtocolFactory::established(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci) { RdmaIOHandler* async = ci->getContext(); async->start(poller); } -bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp, +bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp, ConnectionCodec::Factory* f) { try { RdmaIOHandler* async = new RdmaIOHandler(ci, f); @@ -289,10 +289,10 @@ bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr& ci, const R return false; } -void RdmaIOProtocolFactory::connectionError(Rdma::Connection::intrusive_ptr&, Rdma::ErrorType) { +void RdmaIOProtocolFactory::connectionError(Rdma::Connection::intrusive_ptr, Rdma::ErrorType) { } -void RdmaIOProtocolFactory::disconnected(Rdma::Connection::intrusive_ptr& ci) { +void RdmaIOProtocolFactory::disconnected(Rdma::Connection::intrusive_ptr ci) { // If we've got a connection already tear it down, otherwise ignore RdmaIOHandler* async = ci->getContext(); if (async) { @@ -330,12 +330,12 @@ void RdmaIOProtocolFactory::accept(Poller::shared_ptr poller, ConnectionCodec::F } // Only used for outgoing connections (in federation) -void RdmaIOProtocolFactory::rejected(Rdma::Connection::intrusive_ptr&, const Rdma::ConnectionParams&, ConnectFailedCallback failed) { +void RdmaIOProtocolFactory::rejected(Rdma::Connection::intrusive_ptr, const Rdma::ConnectionParams&, ConnectFailedCallback failed) { failed(-1, "Connection rejected"); } // Do the same as connection request and established but mark a client too -void RdmaIOProtocolFactory::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci, const Rdma::ConnectionParams& cp, +void RdmaIOProtocolFactory::connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr ci, const Rdma::ConnectionParams& cp, ConnectionCodec::Factory* f) { (void) request(ci, cp, f); established(poller, ci); diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/cpp/src/qpid/sys/rdma/RdmaIO.h index aabb330c42..9f55a7be7c 100644 --- a/cpp/src/qpid/sys/rdma/RdmaIO.h +++ b/cpp/src/qpid/sys/rdma/RdmaIO.h @@ -149,8 +149,8 @@ namespace Rdma { UNKNOWN }; - typedef boost::function2 ErrorCallback; - typedef boost::function1 DisconnectedCallback; + typedef boost::function2 ErrorCallback; + typedef boost::function1 DisconnectedCallback; class ConnectionManager { Connection::intrusive_ptr ci; @@ -177,8 +177,8 @@ namespace Rdma { virtual void connectionEvent(Connection::intrusive_ptr ci) = 0; }; - typedef boost::function2 ConnectionRequestCallback; - typedef boost::function1 EstablishedCallback; + typedef boost::function2 ConnectionRequestCallback; + typedef boost::function1 EstablishedCallback; class Listener : public ConnectionManager { @@ -200,8 +200,8 @@ namespace Rdma { void connectionEvent(Connection::intrusive_ptr ci); }; - typedef boost::function2 RejectedCallback; - typedef boost::function2 ConnectedCallback; + typedef boost::function2 RejectedCallback; + typedef boost::function2 ConnectedCallback; class Connector : public ConnectionManager { -- cgit v1.2.1