You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2010/09/08 18:49:06 UTC
svn commit: r995133 - /qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
Author: astitcher
Date: Wed Sep 8 16:49:06 2010
New Revision: 995133
URL: http://svn.apache.org/viewvc?rev=995133&view=rev
Log:
Dispose the queue pair before acknowledging channel events when destroying
Rdma::QueuePair to stop any events being processed during destruction
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp?rev=995133&r1=995132&r2=995133&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp Wed Sep 8 16:49:06 2010
@@ -139,14 +139,17 @@ namespace Rdma {
}
QueuePair::~QueuePair() {
+ // Reset back pointer in case someone else has the qp
+ qp->qp_context = 0;
+
+ // Dispose queue pair before we ack events
+ qp.reset();
+
if (outstandingSendEvents > 0)
::ibv_ack_cq_events(scq.get(), outstandingSendEvents);
if (outstandingRecvEvents > 0)
::ibv_ack_cq_events(rcq.get(), outstandingRecvEvents);
- // Reset back pointer in case someone else has the qp
- qp->qp_context = 0;
-
// Deallocate recv buffer memory
if (rmr) delete [] static_cast<char*>(rmr->addr);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org