refresh (create temporary patch)

diff --git a/meta b/meta
index 312d05916f936199757f3a86c37052a9be775f6a..8f31e3f2f0e04846bb34469227e4eeae766a2239 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 6e0fa9e3cc28e3f3da1ef97e24d8dd068d63cc09
-Head: 072b55fbcf7a636fa5ce4c3a2924a503edcf2afa
+Previous: 05d0e2651d4a7e96fa3efbe7c2c2aad142cb2092
+Head: 36d8da1b5368cd8f9fd7942d39b64735329b0c04
 Applied:
   rm-build: ade4a4d386664e7a23d492390390256501a58f58
   debug-wv: 072b55fbcf7a636fa5ce4c3a2924a503edcf2afa
+  refresh-temp: 36d8da1b5368cd8f9fd7942d39b64735329b0c04
 Unapplied:
   dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
   dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..1f37123
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,57 @@
+Bottom: b042ad6302fd7700e4f5535e2e0b0d2fc9a500dd
+Top:    5e88620192f8f10448e5d3022a682519970272e8
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-02-03 15:15:52 -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 32090fb..28ee486 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);\r
+       }\r
+ bail:\r
++      if (hca_ptr->ib_trans.ib_cq)\r
++              ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq);\r
++\r
+       if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {\r
+               if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))\r
+                       return (dapl_convert_errno(errno, "ib_close_device"));\r
+diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c
+index bb3893a..c50d985 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)
+       }\r
+ \r
+ out:\r
++      if (hca_ptr->ib_trans.ib_cq)\r
++              ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq);\r
++\r
+       if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {\r
+               if (ibv_close_device(hca_ptr->ib_hca_handle))\r
+                       return (dapl_convert_errno(errno, "ib_close_device"));\r
+diff --git a/trunk/ulp/libibverbs/src/verbs.cpp b/trunk/ulp/libibverbs/src/verbs.cpp
+index 849f8ae..189c90e 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)
+ \r
+       CompChannelInit(&comp_mgr, &channel->comp_channel, INFINITE);\r
+       channel->context = context;\r
++printf("ibv_create_comp_channel %p\n", channel);\r
+       return channel;\r
+ }\r
+ \r
+@@ -333,6 +334,7 @@ __declspec(dllexport)
+ int ibv_destroy_comp_channel(struct ibv_comp_channel *channel)\r
+ {\r
+       CompChannelCleanup(&channel->comp_channel);\r
++printf("ibv_destroy_comp_channel %p\n", channel);\r
+       delete channel;\r
+       return 0;\r
+ }