From 666a6153539a2139b7ca02dad7199d7484443727 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 3 Feb 2010 15:54:51 -0800 Subject: [PATCH] refresh --- meta | 7 ++--- patches/debug-wv | 38 ++++++++++++++++--------- patches/refresh-temp | 66 -------------------------------------------- 3 files changed, 28 insertions(+), 83 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index d7eff5a5..6c6e5afd 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: a7147d9f17d3d41f8b533494b397d2d55f34f67b -Head: 20ab9c5c7510e032b14b6afbaa4e675bfb6f7844 +Previous: 8a63d9d0b7d6650f864a3c04121e4f7b42a2a9cd +Head: 6ec94bca1cb1108bd4619f7698b35c48eaffb07d Applied: rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386 - debug-wv: bff839a15b4659fe982ad398fb069a16163904d8 - refresh-temp: 20ab9c5c7510e032b14b6afbaa4e675bfb6f7844 + debug-wv: 6ec94bca1cb1108bd4619f7698b35c48eaffb07d Unapplied: dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195 dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57 diff --git a/patches/debug-wv b/patches/debug-wv index ba7881be..e79d9c03 100644 --- a/patches/debug-wv +++ b/patches/debug-wv @@ -1,5 +1,5 @@ Bottom: 5949be80df90f7b34e3080d4fb9d318af06f8515 -Top: 9d205f4179a0450b86320a5da225674e3dcff33e +Top: 33b006a7391e21208d7fb20c1fa2fe4ede94f9a2 Author: Sean Hefty Date: 2010-02-03 12:03:32 -0800 @@ -46,52 +46,64 @@ index 32d1aae..552c876 100644 default: break; diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c -index 32090fb..aabfcc7 100644 +index 32090fb..c9d3756 100644 --- a/trunk/ulp/dapl2/dapl/openib_cma/device.c +++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c -@@ -502,6 +502,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) +@@ -502,6 +502,16 @@ 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_trans.ib_cq_empty) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); ++ if (hca_ptr->ib_trans.ib_cq_empty) { ++ struct ibv_comp_channel *channel; ++ channel = hca_ptr->ib_trans.ib_cq_empty->channel; ++ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); ++ ibv_destroy_comp_channel(channel); ++ } + 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 bb3893a..6498640 100644 +index bb3893a..04e992a 100644 --- a/trunk/ulp/dapl2/dapl/openib_scm/device.c +++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c -@@ -504,6 +504,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) +@@ -504,6 +504,16 @@ 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_trans.ib_cq_empty) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); ++ if (hca_ptr->ib_trans.ib_cq_empty) { ++ struct ibv_comp_channel *channel; ++ channel = hca_ptr->ib_trans.ib_cq_empty->channel; ++ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); ++ ibv_destroy_comp_channel(channel); ++ } + 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/dapl2/dapl/openib_ucm/device.c b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -index e890eef..ab4b765 100644 +index e890eef..c583b40 100644 --- a/trunk/ulp/dapl2/dapl/openib_ucm/device.c +++ b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -@@ -401,6 +401,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) +@@ -401,6 +401,16 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) destroy_os_signal(hca_ptr); ucm_service_destroy(hca_ptr); + if (hca_ptr->ib_trans.ib_cq) + ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); + -+ if (hca_ptr->ib_trans.ib_cq_empty) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); ++ if (hca_ptr->ib_trans.ib_cq_empty) { ++ struct ibv_comp_channel *channel; ++ channel = hca_ptr->ib_trans.ib_cq_empty->channel; ++ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); ++ ibv_destroy_comp_channel(channel); ++ } + if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { if (ibv_close_device(hca_ptr->ib_hca_handle)) diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index d361b9f2..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,66 +0,0 @@ -Bottom: 9d205f4179a0450b86320a5da225674e3dcff33e -Top: 33b006a7391e21208d7fb20c1fa2fe4ede94f9a2 -Author: Sean Hefty -Date: 2010-02-03 15:54:46 -0800 - -Refresh of debug-wv - ---- - -diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c -index aabfcc7..c9d3756 100644 ---- a/trunk/ulp/dapl2/dapl/openib_cma/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c -@@ -505,8 +505,12 @@ bail: - if (hca_ptr->ib_trans.ib_cq) - ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); - -- if (hca_ptr->ib_trans.ib_cq_empty) -- ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } - - if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { - if (rdma_destroy_id(hca_ptr->ib_trans.cm_id)) -diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c -index 6498640..04e992a 100644 ---- a/trunk/ulp/dapl2/dapl/openib_scm/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c -@@ -507,8 +507,12 @@ out: - if (hca_ptr->ib_trans.ib_cq) - ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); - -- if (hca_ptr->ib_trans.ib_cq_empty) -- ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } - - if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { - if (ibv_close_device(hca_ptr->ib_hca_handle)) -diff --git a/trunk/ulp/dapl2/dapl/openib_ucm/device.c b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -index ab4b765..c583b40 100644 ---- a/trunk/ulp/dapl2/dapl/openib_ucm/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -@@ -404,8 +404,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) - if (hca_ptr->ib_trans.ib_cq) - ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); - -- if (hca_ptr->ib_trans.ib_cq_empty) -- ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq_empty); -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } - - if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) { - if (ibv_close_device(hca_ptr->ib_hca_handle)) -- 2.46.0