From c36802e57e42eee8f7a633b58227d410f1a05db3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 2 Feb 2010 11:59:18 -0800 Subject: [PATCH] refresh --- meta | 7 +++--- patches/dapl-debug | 46 +++++++++++++++++++++++++++++++++++--- patches/refresh-temp | 53 -------------------------------------------- 3 files changed, 46 insertions(+), 60 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index c950e3bf..961b9a73 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 9ad63acdb905d45b666648a40d4d758e09409a8e -Head: 676321406e82f8ab8c01c2366a7710e70672eebf +Previous: d20d25745ea21a81a3904e1c311d373d3bc38b1c +Head: 78644cd36e89f7a7a65980b4614c790e2dd881d7 Applied: - dapl-debug: 5db71368a72b028e413c9180710fe4353cef5342 - refresh-temp: 676321406e82f8ab8c01c2366a7710e70672eebf + dapl-debug: 78644cd36e89f7a7a65980b4614c790e2dd881d7 Unapplied: dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57 librdmacm-pdata: 89539a28633f55a8c9da242850123c56f3a2b303 diff --git a/patches/dapl-debug b/patches/dapl-debug index 78128996..63dceae2 100644 --- a/patches/dapl-debug +++ b/patches/dapl-debug @@ -1,5 +1,5 @@ Bottom: 3f445e8cdd9f9563418a9aa82de3d988ae7df6c0 -Top: 279a7cbad98d18aa2e90d3a8589de1078c0238dc +Top: 021e826651feaa392af5c6d845bf92bee8dccbe0 Author: Sean Hefty Date: 2010-02-01 16:12:47 -0800 @@ -9,7 +9,7 @@ show me the dapl debug!!! --- diff --git a/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c b/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c -index 6268cc6..034cc66 100644 +index 6268cc6..1bae2d6 100644 --- a/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c +++ b/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c @@ -152,7 +152,7 @@ void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_ @@ -21,6 +21,18 @@ index 6268cc6..034cc66 100644 "---> dapls_cr_callback: conn event on down SP\n"); (void)dapls_ib_reject_connection(ib_cm_handle, DAT_CONNECTION_EVENT_UNREACHABLE, +@@ -233,9 +233,10 @@ void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_ + + break; + } ++ case DAT_CONNECTION_EVENT_UNREACHABLE: ++ dapl_log(DAPL_DEBUG_TYPE_ERR, "unreachable, eh?\n"); + case DAT_CONNECTION_EVENT_NON_PEER_REJECTED: + case DAT_CONNECTION_EVENT_PEER_REJECTED: +- case DAT_CONNECTION_EVENT_UNREACHABLE: + { + /* + * After posting an accept the requesting node has diff --git a/trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c b/trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c index a14785b..10c2250 100644 --- a/trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c @@ -32,4 +44,32 @@ index a14785b..10c2250 100644 + dapl_log(DAPL_DBG_TYPE_ERR, "dapls_evd_post_conn_event\n"); dapls_evd_post_connection_event((DAPL_EVD *) ep_ptr-> param. - connect_evd_handle, + connect_evd_handle, +diff --git a/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c b/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c +index 841b28d..45f02a6 100644 +--- a/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c ++++ b/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c +@@ -157,8 +157,9 @@ dapl_evd_connection_callback(IN dp_ib_cm_handle_t ib_cm_handle, + "dapl_evd_connection_callback PEER REJ pd=%p sz=%d\n", + prd_ptr, private_data_size); + } +- case DAT_CONNECTION_EVENT_DISCONNECTED: + case DAT_CONNECTION_EVENT_UNREACHABLE: ++ dapl_log(DAPL_DEBUG_TYPE_ERR, "unreachable, no?\n"); ++ case DAT_CONNECTION_EVENT_DISCONNECTED: + case DAT_CONNECTION_EVENT_NON_PEER_REJECTED: + { + ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED; +diff --git a/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c b/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c +index cc0aa17..8eede5c 100644 +--- a/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c ++++ b/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c +@@ -999,7 +999,7 @@ dapls_evd_post_cr_event_ext(IN DAPL_SP * sp_ptr, + dapl_os_lock(&sp_ptr->header.lock); + if (sp_ptr->listening == DAT_FALSE) { + dapl_os_unlock(&sp_ptr->header.lock); +- dapl_dbg_log(DAPL_DBG_TYPE_CM, ++ dapl_log(DAPL_DBG_TYPE_ERR, + "---> post_cr_event_ext: conn event on down SP\n"); + (void)dapls_ib_reject_connection(ib_cm_handle, + DAT_CONNECTION_EVENT_UNREACHABLE, diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 8e5bdc6d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,53 +0,0 @@ -Bottom: 279a7cbad98d18aa2e90d3a8589de1078c0238dc -Top: 021e826651feaa392af5c6d845bf92bee8dccbe0 -Author: Sean Hefty -Date: 2010-02-02 11:59:12 -0800 - -Refresh of dapl-debug - ---- - -diff --git a/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c b/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c -index 034cc66..1bae2d6 100644 ---- a/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c -+++ b/trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c -@@ -233,9 +233,10 @@ void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_ - - break; - } -+ case DAT_CONNECTION_EVENT_UNREACHABLE: -+ dapl_log(DAPL_DEBUG_TYPE_ERR, "unreachable, eh?\n"); - case DAT_CONNECTION_EVENT_NON_PEER_REJECTED: - case DAT_CONNECTION_EVENT_PEER_REJECTED: -- case DAT_CONNECTION_EVENT_UNREACHABLE: - { - /* - * After posting an accept the requesting node has -diff --git a/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c b/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c -index 841b28d..45f02a6 100644 ---- a/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c -+++ b/trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c -@@ -157,8 +157,9 @@ dapl_evd_connection_callback(IN dp_ib_cm_handle_t ib_cm_handle, - "dapl_evd_connection_callback PEER REJ pd=%p sz=%d\n", - prd_ptr, private_data_size); - } -- case DAT_CONNECTION_EVENT_DISCONNECTED: - case DAT_CONNECTION_EVENT_UNREACHABLE: -+ dapl_log(DAPL_DEBUG_TYPE_ERR, "unreachable, no?\n"); -+ case DAT_CONNECTION_EVENT_DISCONNECTED: - case DAT_CONNECTION_EVENT_NON_PEER_REJECTED: - { - ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED; -diff --git a/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c b/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c -index cc0aa17..8eede5c 100644 ---- a/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c -+++ b/trunk/ulp/dapl2/dapl/common/dapl_evd_util.c -@@ -999,7 +999,7 @@ dapls_evd_post_cr_event_ext(IN DAPL_SP * sp_ptr, - dapl_os_lock(&sp_ptr->header.lock); - if (sp_ptr->listening == DAT_FALSE) { - dapl_os_unlock(&sp_ptr->header.lock); -- dapl_dbg_log(DAPL_DBG_TYPE_CM, -+ dapl_log(DAPL_DBG_TYPE_ERR, - "---> post_cr_event_ext: conn event on down SP\n"); - (void)dapls_ib_reject_connection(ib_cm_handle, - DAT_CONNECTION_EVENT_UNREACHABLE, -- 2.46.0