From dc8d3791207d0daa01fae87fd9e260f37eaba8c5 Mon Sep 17 00:00:00 2001 From: Arlin Davis Date: Mon, 3 Feb 2014 19:14:31 -0800 Subject: [PATCH] scm: add/cleanup debug log information Signed-off-by: Arlin Davis --- dapl/openib_scm/cm.c | 12 ++++++------ dapl/openib_scm/device.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dapl/openib_scm/cm.c b/dapl/openib_scm/cm.c index 432ea7f..252c198 100644 --- a/dapl/openib_scm/cm.c +++ b/dapl/openib_scm/cm.c @@ -1486,17 +1486,17 @@ bail: */ DAT_RETURN dapls_ib_connect(IN DAT_EP_HANDLE ep_handle, - IN DAT_IA_ADDRESS_PTR remote_ia_address, - IN DAT_CONN_QUAL remote_conn_qual, + IN DAT_IA_ADDRESS_PTR r_address, + IN DAT_CONN_QUAL r_qual, IN DAT_COUNT private_data_size, IN void *private_data) { DAPL_EP *ep_ptr = (DAPL_EP *) ep_handle; + struct sockaddr_in *scm_ia = (struct sockaddr_in *)r_address; - dapl_dbg_log(DAPL_DBG_TYPE_EP, - " connect(ep_handle %p ....)\n", ep_handle); + dapl_log(DAPL_DBG_TYPE_CM, " SCM connect -> IP %s port 0x%x,%d)\n", + inet_ntoa(scm_ia->sin_addr), r_qual + 1000, r_qual + 1000); - return (dapli_socket_connect(ep_ptr, remote_ia_address, - remote_conn_qual, + return (dapli_socket_connect(ep_ptr, r_address, r_qual, private_data_size, private_data, SCM_CR_RETRY)); } diff --git a/dapl/openib_scm/device.c b/dapl/openib_scm/device.c index 2d07da5..1b7e970 100644 --- a/dapl/openib_scm/device.c +++ b/dapl/openib_scm/device.c @@ -432,12 +432,12 @@ found: dapl_os_sleep_usec(1000); } - dapl_dbg_log(DAPL_DBG_TYPE_UTIL, - " open_hca: devname %s, port %d, hostname_IP %s\n", + dapl_log(DAPL_DBG_TYPE_CM, + " SCM IA: devname %s, IB port %d, hostname_IP %s\n", ibv_get_device_name(hca_ptr->ib_trans.ib_dev), - hca_ptr->port_num, inet_ntoa(((struct sockaddr_in *) - &hca_ptr->hca_address)-> - sin_addr)); + hca_ptr->port_num, + inet_ntoa(((struct sockaddr_in *) + &hca_ptr->hca_address)->sin_addr)); dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " open_hca: LID 0x%x GID Subnet 0x" F64x " ID 0x" F64x "\n", ntohs(hca_ptr->ib_trans.lid), (unsigned long long) -- 2.41.0