From 36d8da1b5368cd8f9fd7942d39b64735329b0c04 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 3 Feb 2010 15:15:52 -0800 Subject: [PATCH] Refresh of debug-wv --- trunk/ulp/dapl2/dapl/openib_cma/device.c | 3 +++ trunk/ulp/dapl2/dapl/openib_scm/device.c | 3 +++ trunk/ulp/libibverbs/src/verbs.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c index 32090fbe..28ee4860 100644 --- a/trunk/ulp/dapl2/dapl/openib_cma/device.c +++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c @@ -502,6 +502,9 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) dapl_os_sleep_usec(1000); } bail: + if (hca_ptr->ib_trans.ib_cq) + ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); + if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { if (rdma_destroy_id(hca_ptr->ib_trans.cm_id)) return (dapl_convert_errno(errno, "ib_close_device")); diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c index bb3893a7..c50d9851 100644 --- a/trunk/ulp/dapl2/dapl/openib_scm/device.c +++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c @@ -504,6 +504,9 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) } out: + if (hca_ptr->ib_trans.ib_cq) + ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); + if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { if (ibv_close_device(hca_ptr->ib_hca_handle)) return (dapl_convert_errno(errno, "ib_close_device")); diff --git a/trunk/ulp/libibverbs/src/verbs.cpp b/trunk/ulp/libibverbs/src/verbs.cpp index 849f8aeb..189c90e9 100644 --- a/trunk/ulp/libibverbs/src/verbs.cpp +++ b/trunk/ulp/libibverbs/src/verbs.cpp @@ -326,6 +326,7 @@ struct ibv_comp_channel *ibv_create_comp_channel(struct ibv_context *context) CompChannelInit(&comp_mgr, &channel->comp_channel, INFINITE); channel->context = context; +printf("ibv_create_comp_channel %p\n", channel); return channel; } @@ -333,6 +334,7 @@ __declspec(dllexport) int ibv_destroy_comp_channel(struct ibv_comp_channel *channel) { CompChannelCleanup(&channel->comp_channel); +printf("ibv_destroy_comp_channel %p\n", channel); delete channel; return 0; } -- 2.46.0