Plumb rdma protocol version into Rdma::AsynchIO

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1052323 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 8 insertions, 0 deletions

diff --git a/qpid/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
index 79f86d09c2..313a99df68 100644
--- a/qpid/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
@@ -196,6 +196,7 @@ void RdmaConnector::connected(Poller::shared_ptr poller, Rdma::Connection::intru
         Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair();
 
         aio = new Rdma::AsynchIO(ci->getQueuePair(),
+            cp.rdmaProtocolVersion,
             cp.maxRecvBufferSize, cp.initialXmitCredit , Rdma::DEFAULT_WR_ENTRIES,
             boost::bind(&RdmaConnector::readbuff, this, _1, _2),
             boost::bind(&RdmaConnector::writebuff, this, _1),
diff --git a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index b03f62337f..984f4daf89 100644
--- a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -301,6 +301,7 @@ bool RdmaIOProtocolFactory::request(Rdma::Connection::intrusive_ptr ci, const Rd
         RdmaIOHandler* async = new RdmaIOHandler(ci, f);
         Rdma::AsynchIO* aio =
             new Rdma::AsynchIO(ci->getQueuePair(),
+                cp.rdmaProtocolVersion,
                 cp.maxRecvBufferSize, cp.initialXmitCredit, Rdma::DEFAULT_WR_ENTRIES,
                 boost::bind(&RdmaIOHandler::readbuff, async, _1, _2),
                 boost::bind(&RdmaIOHandler::idle, async, _1),
diff --git a/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
index 651e389064..67c672f857 100644
--- a/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
@@ -164,6 +164,7 @@ void connected(Poller::shared_ptr poller, Rdma::Connection::intrusive_ptr& ci, c
     Rdma::QueuePair::intrusive_ptr q = ci->getQueuePair();
 
     Rdma::AsynchIO* aio = new Rdma::AsynchIO(ci->getQueuePair(),
+        cp.rdmaProtocolVersion,
         cp.maxRecvBufferSize, cp.initialXmitCredit , Rdma::DEFAULT_WR_ENTRIES,
         boost::bind(&data, poller, _1, _2),
         boost::bind(&idle, poller, _1),
diff --git a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 26f780726f..889544601f 100644
--- a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
@@ -71,6 +71,7 @@ namespace Rdma {
 
     AsynchIO::AsynchIO(
             QueuePair::intrusive_ptr q,
+            int version,
             int size,
             int xCredit,
             int rCount,
@@ -79,6 +80,7 @@ namespace Rdma {
             FullCallback fc,
             ErrorCallback ec
     ) :
+        protocolVersion(version),
         bufferSize(size),
         recvCredit(0),
         xmitCredit(xCredit),
diff --git a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
index d8b37d5fad..7a72feba4c 100644
--- a/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
@@ -45,6 +45,7 @@ namespace Rdma {
         typedef boost::function2<void, AsynchIO&, Buffer*> FullCallback;
         typedef boost::function1<void, AsynchIO&> NotifyCallback;
 
+        int protocolVersion;
         int bufferSize;
         int recvCredit;
         int xmitCredit;
@@ -73,6 +74,7 @@ namespace Rdma {
         // locked memory
         AsynchIO(
             QueuePair::intrusive_ptr q,
+            int version,
             int size,
             int xCredit,
             int rCount,
diff --git a/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
index a23f9194f5..d924c388ec 100644
--- a/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
@@ -145,6 +145,7 @@ bool connectionRequest(Rdma::Connection::intrusive_ptr& ci,  const Rdma::Connect
         ConRec* cr = new ConRec(ci);
         Rdma::AsynchIO* aio =
             new Rdma::AsynchIO(ci->getQueuePair(),
+                cp.rdmaProtocolVersion,
                 cp.maxRecvBufferSize, cp.initialXmitCredit, Rdma::DEFAULT_WR_ENTRIES,
                 boost::bind(data, cr, _1, _2),
                 boost::bind(idle, cr, _1),