diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2010-05-13 02:26:26 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2010-05-13 02:26:26 +0000 |
| commit | f568c73ad1a83fc76465193a0d669e15698d35a0 (patch) | |
| tree | a45a6cc6b549664cb7affbb3d2796d92de699994 /cpp/src | |
| parent | ad2ba4e72e4cc2fafd5b110d04d8eb258bc207d3 (diff) | |
| download | qpid-python-f568c73ad1a83fc76465193a0d669e15698d35a0.tar.gz | |
Transfer TCP code changes to RDMA code
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@943772 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/client/RdmaConnector.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/cpp/src/qpid/client/RdmaConnector.cpp index 42b4649203..a782caef6b 100644 --- a/cpp/src/qpid/client/RdmaConnector.cpp +++ b/cpp/src/qpid/client/RdmaConnector.cpp @@ -96,8 +96,6 @@ class RdmaConnector : public Connector, public sys::Codec std::string identifier; - ConnectionImpl* impl; - void connect(const std::string& host, int port); void close(); void send(framing::AMQFrame& frame); @@ -150,8 +148,7 @@ RdmaConnector::RdmaConnector(Poller::shared_ptr p, polling(false), shutdownHandler(0), aio(0), - poller(p), - impl(cimpl) + poller(p) { QPID_LOG(debug, "RdmaConnector created for " << version); } @@ -247,7 +244,7 @@ const std::string& RdmaConnector::getIdentifier() const { void RdmaConnector::send(AMQFrame& frame) { bool notifyWrite = false; { - Mutex::ScopedLock l(lock); + Mutex::ScopedLock l(lock); frames.push_back(frame); //only ask to write if this is the end of a frameset or if we //already have a buffers worth of data @@ -259,7 +256,7 @@ void RdmaConnector::send(AMQFrame& frame) { notifyWrite = (currentSize >= maxFrameSize); } } - if (notifyWrite) aio->notifyPendingWrite(); + if (notifyWrite && polling) aio->notifyPendingWrite(); } void RdmaConnector::handleClosed() { @@ -270,6 +267,10 @@ void RdmaConnector::handleClosed() { // Called in IO thread. (write idle routine) // This is NOT only called in response to previously calling notifyPendingWrite void RdmaConnector::writebuff(Rdma::AsynchIO&) { + // It's possible to be disconnected and be writable + if (!polling) + return; + Codec* codec = securityLayer.get() ? (Codec*) securityLayer.get() : (Codec*) this; if (codec->canEncode()) { std::auto_ptr<BufferBase> buffer = std::auto_ptr<BufferBase>(aio->getBuffer()); |