From: Sean Hefty Date: Tue, 2 Feb 2010 00:12:47 +0000 (-0800) Subject: show me the dapl debug!!! X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e13c7a46d1fab529c3008c37bac955a1d7738195;p=~shefty%2Frdma-win.git 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 6268cc6f..056e742d 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_ 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, "---> 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_DBG_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 a14785bd..10c2250a 100644 --- a/trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c +++ b/trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c @@ -309,6 +309,7 @@ dapl_ep_connect(IN DAT_EP_HANDLE ep_handle, * this happens, return SUCCESS and generate the event */ if (dat_status == DAT_ERROR(DAT_INTERNAL_ERROR, 1)) { + 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, 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 841b28d0..8f3ba117 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_DBG_TYPE_ERR, "dapl_evd_connection_callback unreachable 0x%x\n", ib_cm_event); + 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 cc0aa17c..8eede5cb 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/trunk/ulp/dapl2/dapl/openib_cma/cm.c b/trunk/ulp/dapl2/dapl/openib_cma/cm.c index b8f71988..395c6020 100644 --- a/trunk/ulp/dapl2/dapl/openib_cma/cm.c +++ b/trunk/ulp/dapl2/dapl/openib_cma/cm.c @@ -148,6 +148,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn) return; bail: +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_resolve_route - bailing\n"); dapl_evd_connection_callback(conn, IB_CME_LOCAL_FAILURE, NULL, 0, conn->ep); } @@ -335,6 +336,7 @@ static void dapli_cm_active_cb(struct dapl_cm_id *conn, switch (event->event) { case RDMA_CM_EVENT_UNREACHABLE: case RDMA_CM_EVENT_CONNECT_ERROR: +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cm_active_cb event 0x%x\n", event->event); dapl_log(DAPL_DBG_TYPE_WARN, "dapl_cma_active: CONN_ERR event=0x%x" " status=%d %s DST %s, %d\n", @@ -351,6 +353,7 @@ static void dapli_cm_active_cb(struct dapl_cm_id *conn, ib_cm_event = IB_CME_DESTINATION_UNREACHABLE; break; case RDMA_CM_EVENT_REJECTED: +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cm_active_cb reject event 0x%x\n", event->event); dapl_dbg_log(DAPL_DBG_TYPE_CM, " dapli_cm_active_handler: REJECTED reason=%d\n", event->status); @@ -1183,6 +1186,7 @@ void dapli_cma_event_cb(void) &conn->cm_id->route.addr.dst_addr)-> sin_port)); +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cma_event_cb addr error 0x%x\n", event->event); dapl_evd_connection_callback(conn, IB_CME_DESTINATION_UNREACHABLE, NULL, 0, conn->ep); @@ -1219,6 +1223,7 @@ void dapli_cma_event_cb(void) break; case RDMA_CM_EVENT_DEVICE_REMOVAL: +dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cma_event_cb device removed 0x%x\n", event->event); dapl_evd_connection_callback(conn, IB_CME_LOCAL_FAILURE, NULL, 0, conn->ep); diff --git a/trunk/ulp/librdmacm/src/cma.cpp b/trunk/ulp/librdmacm/src/cma.cpp index cde309b8..86efc443 100644 --- a/trunk/ulp/librdmacm/src/cma.cpp +++ b/trunk/ulp/librdmacm/src/cma.cpp @@ -904,6 +904,7 @@ static int ucma_process_conn_resp(struct cma_event *event) HRESULT hr; if (FAILED(event->event.status)) { +printf("ucma_process_conn_resp - failed 0x%x\n", event->event.status); goto err; } @@ -915,6 +916,7 @@ static int ucma_process_conn_resp(struct cma_event *event) hr = id->ep.connect->Accept(id->qp->conn_handle, &attr, &id->comp_entry.Overlap); if (FAILED(hr) && hr != WV_IO_PENDING) { +printf("ucma_process_conn_resp - accept failed 0x%x\n", hr); id->comp_entry.Busy = 0; event->event.status = hr; goto err; @@ -938,6 +940,8 @@ static void ucma_process_establish(struct cma_event *event) event->event.status = ucma_query_connect(&id_priv->id, &event->event.param.conn); } +else + printf("ucma_process_establish error 0x%x\n", event->event.status); if (SUCCEEDED(event->event.status)) { event->event.event = RDMA_CM_EVENT_ESTABLISHED; @@ -947,6 +951,7 @@ static void ucma_process_establish(struct cma_event *event) id_priv->id.comp_entry.Busy = 1; id_priv->id.ep.connect->NotifyDisconnect(&id_priv->id.comp_entry.Overlap); } else { +printf("ucma_process_establish failure 0x%x\n", event->event.status); event->event.event = RDMA_CM_EVENT_CONNECT_ERROR; event->id_priv->state = cma_disconnected; }