refresh

diff --git a/meta b/meta
index e598cfe5cd038b2c3f5a45b516ebf0e0e77312da..41e715487cb097921bd87d255c9643fe2c8045e7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: fc06ba4e54ae9e8982d1521e5da24cbe6cf0d618
-Head: b6987cb9b9ec05fb91f6d788a6272903247704cf
+Previous: e02c0d066af270156daba3493148669c1828da48
+Head: a0d4bca2010a5d133e3cfc16f7d894517a90c1fb
 Applied:
-  dapl-spawn: 615619baa0e8be70fd30a890bac007247759802b
-  refresh-temp: b6987cb9b9ec05fb91f6d788a6272903247704cf
+  dapl-spawn: a0d4bca2010a5d133e3cfc16f7d894517a90c1fb
 Unapplied:
   dapl-win: bfc5e1442631c70deb47f6c429aff6a64dcdfcb4
   create_ep: 375b7c37ebf66efede67163fb01a7f2ce07d83c7

diff --git a/patches/dapl-spawn b/patches/dapl-spawn
index 56d3159fdbbdf27c80479bb0bbde09d7c4b0b9a3..5765d04582dd673687d4239ebaaaa4c13e3e54c6 100644 (file)
--- a/patches/dapl-spawn
+++ b/patches/dapl-spawn
@@ -1,5 +1,5 @@
 Bottom: 6e1690af48f30c8d7839fc5dbf6e9f6c7bd92ede
-Top:    df47ff742cc2547287e425bd50227b8e3674b817
+Top:    dbcf25cbcc653c0e705b4ba3fc0bba7672086d8f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-10-14 10:46:46 -0700
 
@@ -9,10 +9,10 @@ dapl: fix spawn test
 ---
 
 diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c b/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
-index 32d50cc..56b3686 100644
+index 32d50cc..a8deeb2 100644
 --- a/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
 +++ b/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
-@@ -157,16 +157,16 @@ DAT_RETURN DAT_API dapl_ep_free(IN DAT_EP_HANDLE ep_handle)
+@@ -157,16 +157,6 @@ DAT_RETURN DAT_API dapl_ep_free(IN DAT_EP_HANDLE ep_handle)
                                   pz_ref_count);
                param->pz_handle = NULL;
        }
@@ -26,20 +26,10 @@ index 32d50cc..56b3686 100644
 -                                 evd_ref_count);
 -              param->request_evd_handle = NULL;
 -      }
-+      //if (param->recv_evd_handle != NULL) {
-+      //      dapl_os_atomic_dec(&((DAPL_EVD *) param->recv_evd_handle)->
-+      //                         evd_ref_count);
-+      //      param->recv_evd_handle = NULL;
-+      //}
-+      //if (param->request_evd_handle != NULL) {
-+      //      dapl_os_atomic_dec(&((DAPL_EVD *) param->request_evd_handle)->
-+      //                         evd_ref_count);
-+      //      param->request_evd_handle = NULL;
-+      //}
        if (param->connect_evd_handle != NULL) {
                dapl_os_atomic_dec(&((DAPL_EVD *) param->connect_evd_handle)->
                                   evd_ref_count);
-@@ -202,7 +202,20 @@ DAT_RETURN DAT_API dapl_ep_free(IN DAT_EP_HANDLE ep_handle)
+@@ -202,7 +192,20 @@ DAT_RETURN DAT_API dapl_ep_free(IN DAT_EP_HANDLE ep_handle)
                }
        }
  
@@ -61,8 +51,28 @@ index 32d50cc..56b3686 100644
  
        /* Free the resource */
        dapl_ep_dealloc(ep_ptr);
+diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c b/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
+index fc911a6..e3c647f 100644
+--- a/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
++++ b/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
+@@ -620,11 +620,13 @@ static void dapli_ep_flush_evd(DAPL_EVD *evd_ptr)
+ 
+ void dapls_ep_flush_cqs(DAPL_EP * ep_ptr)
+ {
+-      if (ep_ptr->param.request_evd_handle)
++      while (dapls_cb_pending(&ep_ptr->req_buffer)) {
+               dapli_ep_flush_evd((DAPL_EVD *) ep_ptr->param.request_evd_handle);
++      }
+ 
+-      if (ep_ptr->param.recv_evd_handle)
++      while (dapls_cb_pending(&ep_ptr->recv_buffer)) {
+               dapli_ep_flush_evd((DAPL_EVD *) ep_ptr->param.recv_evd_handle);
++      }
+ }
+ 
+ /*
 diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-index e843829..7a64f1d 100644
+index e843829..4ea57d7 100644
 --- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
 +++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
 @@ -317,6 +317,7 @@ dapls_ib_qp_free (
@@ -73,7 +83,7 @@ index e843829..7a64f1d 100644
  
        UNREFERENCED_PARAMETER(ia_ptr);
  
-@@ -327,12 +328,20 @@ dapls_ib_qp_free (
+@@ -327,12 +328,19 @@ dapls_ib_qp_free (
        dapl_os_lock(&ep_ptr->header.lock);
        if (( ep_ptr->qp_handle != IB_INVALID_HANDLE ))
        {
@@ -83,7 +93,6 @@ index e843829..7a64f1d 100644
 +              dapl_os_unlock(&ep_ptr->header.lock);
 +
 +              dapls_modify_qp_state_to_error(qp);
-+              dapls_modify_qp_state_to_reset(qp);
 +              dapls_ep_flush_cqs(ep_ptr);
 +
 +              ib_destroy_qp ( qp, ib_sync_destroy );
@@ -98,10 +107,10 @@ index e843829..7a64f1d 100644
      return DAT_SUCCESS;
  }
 diff --git a/trunk/ulp/dapl2/dapl/openib_common/qp.c b/trunk/ulp/dapl2/dapl/openib_common/qp.c
-index 179eef0..6024db3 100644
+index 179eef0..fbb874a 100644
 --- a/trunk/ulp/dapl2/dapl/openib_common/qp.c
 +++ b/trunk/ulp/dapl2/dapl/openib_common/qp.c
-@@ -209,30 +209,38 @@ dapls_ib_qp_alloc(IN DAPL_IA * ia_ptr,
+@@ -209,30 +209,37 @@ dapls_ib_qp_alloc(IN DAPL_IA * ia_ptr,
   */
  DAT_RETURN dapls_ib_qp_free(IN DAPL_IA * ia_ptr, IN DAPL_EP * ep_ptr)
  {
@@ -129,7 +138,6 @@ index 179eef0..6024db3 100644
                /* force error state to flush queue, then destroy */
 -              dapls_modify_qp_state(ep_ptr->qp_handle, IBV_QPS_ERR, 0,0,0);
 +              dapls_modify_qp_state(qp, IBV_QPS_ERR, 0,0,0);
-+              dapls_modify_qp_state(qp, IBV_QPS_RESET, 0,0,0);
 +              dapls_ep_flush_cqs(ep_ptr);
  
 -              if (ibv_destroy_qp(ep_ptr->qp_handle)) {

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4e6b059..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,74 +0,0 @@
-Bottom: df47ff742cc2547287e425bd50227b8e3674b817
-Top:    dbcf25cbcc653c0e705b4ba3fc0bba7672086d8f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-10-14 11:27:46 -0700
-
-Refresh of dapl-spawn
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c b/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
-index 56b3686..a8deeb2 100644
---- a/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
-+++ b/trunk/ulp/dapl2/dapl/common/dapl_ep_free.c
-@@ -157,16 +157,6 @@ DAT_RETURN DAT_API dapl_ep_free(IN DAT_EP_HANDLE ep_handle)
-                                  pz_ref_count);
-               param->pz_handle = NULL;
-       }
--      //if (param->recv_evd_handle != NULL) {
--      //      dapl_os_atomic_dec(&((DAPL_EVD *) param->recv_evd_handle)->
--      //                         evd_ref_count);
--      //      param->recv_evd_handle = NULL;
--      //}
--      //if (param->request_evd_handle != NULL) {
--      //      dapl_os_atomic_dec(&((DAPL_EVD *) param->request_evd_handle)->
--      //                         evd_ref_count);
--      //      param->request_evd_handle = NULL;
--      //}
-       if (param->connect_evd_handle != NULL) {
-               dapl_os_atomic_dec(&((DAPL_EVD *) param->connect_evd_handle)->
-                                  evd_ref_count);
-diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c b/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
-index fc911a6..e3c647f 100644
---- a/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
-+++ b/trunk/ulp/dapl2/dapl/common/dapl_ep_util.c
-@@ -620,11 +620,13 @@ static void dapli_ep_flush_evd(DAPL_EVD *evd_ptr)
- 
- void dapls_ep_flush_cqs(DAPL_EP * ep_ptr)
- {
--      if (ep_ptr->param.request_evd_handle)
-+      while (dapls_cb_pending(&ep_ptr->req_buffer)) {
-               dapli_ep_flush_evd((DAPL_EVD *) ep_ptr->param.request_evd_handle);
-+      }
- 
--      if (ep_ptr->param.recv_evd_handle)
-+      while (dapls_cb_pending(&ep_ptr->recv_buffer)) {
-               dapli_ep_flush_evd((DAPL_EVD *) ep_ptr->param.recv_evd_handle);
-+      }
- }
- 
- /*
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-index 7a64f1d..4ea57d7 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-@@ -333,7 +333,6 @@ dapls_ib_qp_free (
-               dapl_os_unlock(&ep_ptr->header.lock);
- 
-               dapls_modify_qp_state_to_error(qp);
--              dapls_modify_qp_state_to_reset(qp);
-               dapls_ep_flush_cqs(ep_ptr);
- 
-               ib_destroy_qp ( qp, ib_sync_destroy );
-diff --git a/trunk/ulp/dapl2/dapl/openib_common/qp.c b/trunk/ulp/dapl2/dapl/openib_common/qp.c
-index 6024db3..fbb874a 100644
---- a/trunk/ulp/dapl2/dapl/openib_common/qp.c
-+++ b/trunk/ulp/dapl2/dapl/openib_common/qp.c
-@@ -225,7 +225,6 @@ DAT_RETURN dapls_ib_qp_free(IN DAPL_IA * ia_ptr, IN DAPL_EP * ep_ptr)
- 
-               /* force error state to flush queue, then destroy */
-               dapls_modify_qp_state(qp, IBV_QPS_ERR, 0,0,0);
--              dapls_modify_qp_state(qp, IBV_QPS_RESET, 0,0,0);
-               dapls_ep_flush_cqs(ep_ptr);
- 
- #ifdef _OPENIB_CMA_