From 74d3c32e42ab54f3d6f2eec3d0a66d08f800e075 Mon Sep 17 00:00:00 2001 From: James Lentini Date: Thu, 10 Nov 2005 21:39:34 +0000 Subject: [PATCH] r4018: Fixed some problems with the free build openib_scm version and turned down some debugging and added some debug prints for uAT path records. Signed-off by: Arlin Davis Signed-off by: James Lentini --- dapl/openib/dapl_ib_cm.c | 21 +++++++++++++++++---- dapl/openib_scm/dapl_ib_cm.c | 4 ++-- dapl/openib_scm/dapl_ib_cq.c | 3 +-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dapl/openib/dapl_ib_cm.c b/dapl/openib/dapl_ib_cm.c index fc92f06..1f72e3a 100644 --- a/dapl/openib/dapl_ib_cm.c +++ b/dapl/openib/dapl_ib_cm.c @@ -136,14 +136,27 @@ static void dapli_path_comp_handler(uint64_t req_id, void *context, int rec_num) dapl_dbg_log(DAPL_DBG_TYPE_CM, " path_comp_handler: SRC GID subnet %016llx id %016llx\n", - (unsigned long long)cpu_to_be64(conn->dapl_rt.sgid.global.subnet_prefix), - (unsigned long long)cpu_to_be64(conn->dapl_rt.sgid.global.interface_id) ); + (unsigned long long)cpu_to_be64(conn->dapl_path.sgid.global.subnet_prefix), + (unsigned long long)cpu_to_be64(conn->dapl_path.sgid.global.interface_id) ); dapl_dbg_log(DAPL_DBG_TYPE_CM, " path_comp_handler: DST GID subnet %016llx id %016llx\n", - (unsigned long long)cpu_to_be64(conn->dapl_rt.dgid.global.subnet_prefix), - (unsigned long long)cpu_to_be64(conn->dapl_rt.dgid.global.interface_id) ); + (unsigned long long)cpu_to_be64(conn->dapl_path.dgid.global.subnet_prefix), + (unsigned long long)cpu_to_be64(conn->dapl_path.dgid.global.interface_id) ); + dapl_dbg_log(DAPL_DBG_TYPE_CM, + " path_comp_handler: slid %x dlid %x mtu %x(%x) pktlife %x(%x)\n", + ntohs(conn->dapl_path.slid), ntohs(conn->dapl_path.dlid), + conn->dapl_path.mtu, conn->dapl_path.mtu_selector, + conn->dapl_path.packet_life_time, + conn->dapl_path.packet_life_time_selector ); + + dapl_dbg_log(DAPL_DBG_TYPE_CM, + " path_comp_handler: hops %x npaths %x pkey %x tclass %x rate %x(%x)\n", + conn->dapl_path.hop_limit, conn->dapl_path.numb_path, + conn->dapl_path.pkey, conn->dapl_path.traffic_class, + conn->dapl_path.rate, conn->dapl_path.rate_selector); + if (rec_num <= 0) { dapl_dbg_log(DAPL_DBG_TYPE_CM, " path_comp_handler: ERR %d retry %d\n", diff --git a/dapl/openib_scm/dapl_ib_cm.c b/dapl/openib_scm/dapl_ib_cm.c index 11f2dc7..ea75453 100644 --- a/dapl/openib_scm/dapl_ib_cm.c +++ b/dapl/openib_scm/dapl_ib_cm.c @@ -285,7 +285,7 @@ dapli_socket_listen ( DAPL_IA *ia_ptr, if (( bind( cm_ptr->l_socket,(struct sockaddr*)&addr, sizeof(addr) ) < 0) || (listen( cm_ptr->l_socket, 128 ) < 0) ) { - dapl_dbg_log( DAPL_DBG_TYPE_ERR, + dapl_dbg_log( DAPL_DBG_TYPE_CM, " listen: ERROR %s on conn_qual 0x%x\n", strerror(errno),serviceID); @@ -313,7 +313,7 @@ dapli_socket_listen ( DAPL_IA *ia_ptr, return dat_status; bail: - dapl_dbg_log( DAPL_DBG_TYPE_ERR, + dapl_dbg_log( DAPL_DBG_TYPE_CM, " listen: ERROR on conn_qual 0x%x\n",serviceID); if ( cm_ptr->l_socket >= 0 ) close( cm_ptr->l_socket ); diff --git a/dapl/openib_scm/dapl_ib_cq.c b/dapl/openib_scm/dapl_ib_cq.c index c343f4c..7ac7037 100644 --- a/dapl/openib_scm/dapl_ib_cq.c +++ b/dapl/openib_scm/dapl_ib_cq.c @@ -569,7 +569,6 @@ dapls_ib_wait_object_wait ( { struct dapl_evd *evd_ptr; struct ibv_cq *ibv_cq = NULL; - void *ibv_ctx = NULL; int status = 0; int timeout_ms = -1; struct pollfd cq_fd = { @@ -602,7 +601,7 @@ dapls_ib_wait_object_wait ( dapl_dbg_log (DAPL_DBG_TYPE_CM, " cq_object_wait: RET evd %p ibv_cq %p ibv_ctx %p %s\n", - evd_ptr, ibv_cq,ibv_ctx,strerror(errno)); + evd_ptr, ibv_cq,strerror(errno)); return(dapl_convert_errno(status,"cq_wait_object_wait")); -- 2.46.0