]> git.openfabrics.org - ~shefty/rdma-win.git/commitdiff
show me the dapl debug!!!
authorSean Hefty <sean.hefty@intel.com>
Tue, 2 Feb 2010 00:12:47 +0000 (16:12 -0800)
committerSean Hefty <sean.hefty@intel.com>
Tue, 2 Feb 2010 00:12:47 +0000 (16:12 -0800)
trunk/ulp/dapl2/dapl/common/dapl_cr_callback.c
trunk/ulp/dapl2/dapl/common/dapl_ep_connect.c
trunk/ulp/dapl2/dapl/common/dapl_evd_connection_callb.c
trunk/ulp/dapl2/dapl/common/dapl_evd_util.c
trunk/ulp/dapl2/dapl/openib_cma/cm.c
trunk/ulp/librdmacm/src/cma.cpp

index 6268cc6f2ae8b6b2cbcf0a46e90718f4229f5d2e..056e742d8581a513504cea87e2c60be4d5a742a2 100644 (file)
@@ -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);\r
                        if (sp_ptr->listening == DAT_FALSE) {\r
                                dapl_os_unlock(&sp_ptr->header.lock);\r
-                               dapl_dbg_log(DAPL_DBG_TYPE_CM,\r
+                               dapl_log(DAPL_DBG_TYPE_ERR,\r
                                             "---> dapls_cr_callback: conn event on down SP\n");\r
                                (void)dapls_ib_reject_connection(ib_cm_handle,\r
                                                                 DAT_CONNECTION_EVENT_UNREACHABLE,\r
@@ -233,9 +233,10 @@ void dapls_cr_callback(IN dp_ib_cm_handle_t ib_cm_handle, IN const ib_cm_events_
 \r
                        break;\r
                }\r
+       case DAT_CONNECTION_EVENT_UNREACHABLE:\r
+               dapl_log(DAPL_DBG_TYPE_ERR, "unreachable, eh?\n");\r
        case DAT_CONNECTION_EVENT_NON_PEER_REJECTED:\r
        case DAT_CONNECTION_EVENT_PEER_REJECTED:\r
-       case DAT_CONNECTION_EVENT_UNREACHABLE:\r
                {\r
                        /*\r
                         * After posting an accept the requesting node has\r
index a14785bdeae577e6f42b79cc3505a10fd23e44fc..10c2250ab3eb53610e2f8ae83d8035480acabf90 100644 (file)
@@ -309,6 +309,7 @@ dapl_ep_connect(IN DAT_EP_HANDLE ep_handle,
                 * this happens, return SUCCESS and generate the event\r
                 */\r
                if (dat_status == DAT_ERROR(DAT_INTERNAL_ERROR, 1)) {\r
+                       dapl_log(DAPL_DBG_TYPE_ERR, "dapls_evd_post_conn_event\n");\r
                        dapls_evd_post_connection_event((DAPL_EVD *) ep_ptr->\r
                                                        param.\r
                                                        connect_evd_handle,\r
index 841b28d03d1f4ed853c8e55469d790c687684507..8f3ba1179be19d6ede851b259683c51eb07a8ef3 100644 (file)
@@ -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",\r
                                     prd_ptr, private_data_size);\r
                }\r
-       case DAT_CONNECTION_EVENT_DISCONNECTED:\r
        case DAT_CONNECTION_EVENT_UNREACHABLE:\r
+               dapl_log(DAPL_DBG_TYPE_ERR, "dapl_evd_connection_callback unreachable 0x%x\n", ib_cm_event);\r
+       case DAT_CONNECTION_EVENT_DISCONNECTED:\r
        case DAT_CONNECTION_EVENT_NON_PEER_REJECTED:\r
                {\r
                        ep_ptr->param.ep_state = DAT_EP_STATE_DISCONNECTED;\r
index cc0aa17c6e0e7ff3d57e772075866265f3ec7c5a..8eede5cb8f8226d062cb15bc70bfe13bc47e2a86 100644 (file)
@@ -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,
index b8f7198892fe24b2110a76bb081ceb32fd86d1ac..395c602033989751d36cdc7d0249413d87c2db99 100644 (file)
@@ -148,6 +148,7 @@ static void dapli_route_resolve(struct dapl_cm_id *conn)
        return;\r
 \r
       bail:\r
+dapl_log(DAPL_DBG_TYPE_ERR, "dapli_resolve_route - bailing\n");\r
        dapl_evd_connection_callback(conn,\r
                                     IB_CME_LOCAL_FAILURE, NULL, 0, conn->ep);\r
 }\r
@@ -335,6 +336,7 @@ static void dapli_cm_active_cb(struct dapl_cm_id *conn,
        switch (event->event) {\r
        case RDMA_CM_EVENT_UNREACHABLE:\r
        case RDMA_CM_EVENT_CONNECT_ERROR:\r
+dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cm_active_cb event 0x%x\n", event->event);\r
                dapl_log(DAPL_DBG_TYPE_WARN,\r
                         "dapl_cma_active: CONN_ERR event=0x%x"\r
                         " status=%d %s DST %s, %d\n",\r
@@ -351,6 +353,7 @@ static void dapli_cm_active_cb(struct dapl_cm_id *conn,
                ib_cm_event = IB_CME_DESTINATION_UNREACHABLE;\r
                break;\r
        case RDMA_CM_EVENT_REJECTED:\r
+dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cm_active_cb reject event 0x%x\n", event->event);\r
                dapl_dbg_log(DAPL_DBG_TYPE_CM,\r
                             " dapli_cm_active_handler: REJECTED reason=%d\n",\r
                             event->status);\r
@@ -1183,6 +1186,7 @@ void dapli_cma_event_cb(void)
                                        &conn->cm_id->route.addr.dst_addr)->\r
                                       sin_port));\r
 \r
+dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cma_event_cb addr error 0x%x\n", event->event);\r
                        dapl_evd_connection_callback(conn,\r
                                                     IB_CME_DESTINATION_UNREACHABLE,\r
                                                     NULL, 0, conn->ep);\r
@@ -1219,6 +1223,7 @@ void dapli_cma_event_cb(void)
                        break;\r
 \r
                case RDMA_CM_EVENT_DEVICE_REMOVAL:\r
+dapl_log(DAPL_DBG_TYPE_ERR, "dapli_cma_event_cb device removed 0x%x\n", event->event);\r
                        dapl_evd_connection_callback(conn,\r
                                                     IB_CME_LOCAL_FAILURE,\r
                                                     NULL, 0, conn->ep);\r
index cde309b881321206bbbb73204bd544d8d9989991..86efc443747707d12812e4eca28ce6fc818f0b6e 100644 (file)
@@ -904,6 +904,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
        HRESULT hr;\r
 \r
        if (FAILED(event->event.status)) {\r
+printf("ucma_process_conn_resp - failed 0x%x\n", event->event.status);\r
                goto err;\r
        }\r
 \r
@@ -915,6 +916,7 @@ static int ucma_process_conn_resp(struct cma_event *event)
        hr = id->ep.connect->Accept(id->qp->conn_handle, &attr,\r
                                                                &id->comp_entry.Overlap);\r
        if (FAILED(hr) && hr != WV_IO_PENDING) {\r
+printf("ucma_process_conn_resp - accept failed 0x%x\n", hr);\r
                id->comp_entry.Busy = 0;\r
                event->event.status = hr;\r
                goto err;\r
@@ -938,6 +940,8 @@ static void ucma_process_establish(struct cma_event *event)
                event->event.status = ucma_query_connect(&id_priv->id,\r
                                                                                                 &event->event.param.conn);\r
        }\r
+else\r
+ printf("ucma_process_establish error 0x%x\n", event->event.status);\r
 \r
        if (SUCCEEDED(event->event.status)) {\r
                event->event.event = RDMA_CM_EVENT_ESTABLISHED;\r
@@ -947,6 +951,7 @@ static void ucma_process_establish(struct cma_event *event)
                id_priv->id.comp_entry.Busy = 1;\r
                id_priv->id.ep.connect->NotifyDisconnect(&id_priv->id.comp_entry.Overlap);\r
        } else {\r
+printf("ucma_process_establish failure 0x%x\n", event->event.status);\r
                event->event.event = RDMA_CM_EVENT_CONNECT_ERROR;\r
                event->id_priv->state = cma_disconnected;\r
        }\r