[ofa-general] Re: [PATCHv2][TRIVIAL] OpenSM: Display port number in decimal in log messages
Sasha Khapyorsky
sashak at voltaire.com
Tue Oct 7 16:53:03 PDT 2008
Hi Hal,
On 14:07 Fri 03 Oct , Hal Rosenstock wrote:
>
> Cosmetic patch attached. Found some more cases...
The patch is broken (it has parts from previous patch) and doesn't apply
clearly. So I was need to apply this to another branch and rebase. Also
please next time add 'Sign-off-by'.
Sasha
>
> -- Hal
> diff --git a/opensm/opensm/osm_drop_mgr.c b/opensm/opensm/osm_drop_mgr.c
> index e827c26..8c6e7fb 100644
> --- a/opensm/opensm/osm_drop_mgr.c
> +++ b/opensm/opensm/osm_drop_mgr.c
> @@ -103,7 +103,7 @@ static void drop_mgr_clean_physp(osm_sm_t * sm, IN osm_physp_t * p_physp)
> IB_LINK_ACTIVE) {
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> "Forcing new heavy sweep. Remote "
> - "port 0x%016" PRIx64 " port num: 0x%X "
> + "port 0x%016" PRIx64 " port num: %u "
> "was recognized in ACTIVE state\n",
> cl_ntoh64(p_remote_physp->port_guid),
> p_remote_physp->port_num);
> @@ -117,7 +117,7 @@ static void drop_mgr_clean_physp(osm_sm_t * sm, IN osm_physp_t * p_physp)
> p_remote_port->discovery_count = 0;
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> "Resetting discovery count of node: "
> - "0x%016" PRIx64 " port num:0x%X\n",
> + "0x%016" PRIx64 " port num:%u\n",
> cl_ntoh64(osm_node_get_node_guid
> (p_remote_physp->p_node)),
> p_remote_physp->port_num);
> @@ -125,9 +125,9 @@ static void drop_mgr_clean_physp(osm_sm_t * sm, IN osm_physp_t * p_physp)
> }
>
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> - "Unlinking local node 0x%016" PRIx64 ", port 0x%X"
> + "Unlinking local node 0x%016" PRIx64 ", port %u"
> "\n\t\t\t\tand remote node 0x%016" PRIx64
> - ", port 0x%X\n",
> + ", port %u\n",
> cl_ntoh64(osm_node_get_node_guid(p_physp->p_node)),
> p_physp->port_num,
> cl_ntoh64(osm_node_get_node_guid
> @@ -139,7 +139,7 @@ static void drop_mgr_clean_physp(osm_sm_t * sm, IN osm_physp_t * p_physp)
> }
>
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> - "Clearing node 0x%016" PRIx64 " physical port number 0x%X\n",
> + "Clearing node 0x%016" PRIx64 " physical port number %u\n",
> cl_ntoh64(osm_node_get_node_guid(p_physp->p_node)),
> p_physp->port_num);
>
> @@ -186,7 +186,8 @@ static void __osm_drop_mgr_remove_port(osm_sm_t * sm, IN osm_port_t * p_port)
> if (p_sm != (osm_remote_sm_t *) cl_qmap_end(p_sm_guid_tbl)) {
> /* need to remove this item */
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> - "Cleaned SM for port guid\n");
> + "Cleaned SM for port guid 0x%016" PRIx64 "\n",
> + cl_ntoh64(port_guid));
>
> free(p_sm);
> }
> diff --git a/opensm/opensm/osm_helper.c b/opensm/opensm/osm_helper.c
> index 4c67c3f..45a100e 100644
> --- a/opensm/opensm/osm_helper.c
> +++ b/opensm/opensm/osm_helper.c
> @@ -780,7 +780,7 @@ osm_dump_port_info(IN osm_log_t * const p_log,
>
> osm_log(p_log, log_level,
> "PortInfo dump:\n"
> - "\t\t\t\tport number.............0x%X\n"
> + "\t\t\t\tport number.............%u\n"
> "\t\t\t\tnode_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tport_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tm_key...................0x%016" PRIx64 "\n"
> @@ -790,7 +790,7 @@ osm_dump_port_info(IN osm_log_t * const p_log,
> "\t\t\t\tcapability_mask.........0x%X\n"
> "\t\t\t\tdiag_code...............0x%X\n"
> "\t\t\t\tm_key_lease_period......0x%X\n"
> - "\t\t\t\tlocal_port_num..........0x%X\n"
> + "\t\t\t\tlocal_port_num..........%u\n"
> "\t\t\t\tlink_width_enabled......0x%X\n"
> "\t\t\t\tlink_width_supported....0x%X\n"
> "\t\t\t\tlink_width_active.......0x%X\n"
> @@ -879,7 +879,7 @@ osm_dump_portinfo_record(IN osm_log_t * const p_log,
> "\t\t\t\tcapability_mask.........0x%X\n"
> "\t\t\t\tdiag_code...............0x%X\n"
> "\t\t\t\tm_key_lease_period......0x%X\n"
> - "\t\t\t\tlocal_port_num..........0x%X\n"
> + "\t\t\t\tlocal_port_num..........%u\n"
> "\t\t\t\tlink_width_enabled......0x%X\n"
> "\t\t\t\tlink_width_supported....0x%X\n"
> "\t\t\t\tlink_width_active.......0x%X\n"
> @@ -994,14 +994,14 @@ osm_dump_node_info(IN osm_log_t * const p_log,
> "\t\t\t\tbase_version............0x%X\n"
> "\t\t\t\tclass_version...........0x%X\n"
> "\t\t\t\tnode_type...............%s\n"
> - "\t\t\t\tnum_ports...............0x%X\n"
> + "\t\t\t\tnum_ports...............%u\n"
> "\t\t\t\tsys_guid................0x%016" PRIx64 "\n"
> "\t\t\t\tnode_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tport_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tpartition_cap...........0x%X\n"
> "\t\t\t\tdevice_id...............0x%X\n"
> "\t\t\t\trevision................0x%X\n"
> - "\t\t\t\tport_num................0x%X\n"
> + "\t\t\t\tport_num................%u\n"
> "\t\t\t\tvendor_id...............0x%X\n",
> p_ni->base_version,
> p_ni->class_version,
> @@ -1041,14 +1041,14 @@ osm_dump_node_record(IN osm_log_t * const p_log,
> "\t\t\t\tbase_version............0x%X\n"
> "\t\t\t\tclass_version...........0x%X\n"
> "\t\t\t\tnode_type...............%s\n"
> - "\t\t\t\tnum_ports...............0x%X\n"
> + "\t\t\t\tnum_ports...............%u\n"
> "\t\t\t\tsys_guid................0x%016" PRIx64 "\n"
> "\t\t\t\tnode_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tport_guid...............0x%016" PRIx64 "\n"
> "\t\t\t\tpartition_cap...........0x%X\n"
> "\t\t\t\tdevice_id...............0x%X\n"
> "\t\t\t\trevision................0x%X\n"
> - "\t\t\t\tport_num................0x%X\n"
> + "\t\t\t\tport_num................%u\n"
> "\t\t\t\tvendor_id...............0x%X\n"
> "\t\t\t\tNodeDescription\n"
> "\t\t\t\t%s\n",
> @@ -1489,8 +1489,8 @@ osm_dump_link_record(IN osm_log_t * const p_log,
> osm_log(p_log, log_level,
> "Link Record dump:\n"
> "\t\t\t\tfrom_lid................%u\n"
> - "\t\t\t\tfrom_port_num...........0x%X\n"
> - "\t\t\t\tto_port_num.............0x%X\n"
> + "\t\t\t\tfrom_port_num...........%u\n"
> + "\t\t\t\tto_port_num.............%u\n"
> "\t\t\t\tto_lid..................%u\n",
> cl_ntoh16(p_lr->from_lid),
> p_lr->from_port_num,
> @@ -1512,9 +1512,9 @@ osm_dump_switch_info(IN osm_log_t * const p_log,
> "\t\t\t\trand_cap................0x%X\n"
> "\t\t\t\tmcast_cap...............0x%X\n"
> "\t\t\t\tlin_top.................0x%X\n"
> - "\t\t\t\tdef_port................0x%X\n"
> - "\t\t\t\tdef_mcast_pri_port......0x%X\n"
> - "\t\t\t\tdef_mcast_not_port......0x%X\n"
> + "\t\t\t\tdef_port................%u\n"
> + "\t\t\t\tdef_mcast_pri_port......%u\n"
> + "\t\t\t\tdef_mcast_not_port......%u\n"
> "\t\t\t\tlife_state..............0x%X\n"
> "\t\t\t\tlids_per_port...........%u\n"
> "\t\t\t\tpartition_enf_cap.......0x%X\n"
> @@ -1549,9 +1549,9 @@ osm_dump_switch_info_record(IN osm_log_t * const p_log,
> "\t\t\t\trand_cap................0x%X\n"
> "\t\t\t\tmcast_cap...............0x%X\n"
> "\t\t\t\tlin_top.................0x%X\n"
> - "\t\t\t\tdef_port................0x%X\n"
> - "\t\t\t\tdef_mcast_pri_port......0x%X\n"
> - "\t\t\t\tdef_mcast_not_port......0x%X\n"
> + "\t\t\t\tdef_port................%u\n"
> + "\t\t\t\tdef_mcast_pri_port......%u\n"
> + "\t\t\t\tdef_mcast_not_port......%u\n"
> "\t\t\t\tlife_state..............0x%X\n"
> "\t\t\t\tlids_per_port...........%u\n"
> "\t\t\t\tpartition_enf_cap.......0x%X\n"
> @@ -1593,7 +1593,7 @@ osm_dump_pkey_block(IN osm_log_t * const p_log,
> "P_Key table dump:\n"
> "\t\t\tport_guid...........0x%016" PRIx64 "\n"
> "\t\t\tblock_num...........0x%X\n"
> - "\t\t\tport_num............0x%X\n\tP_Key Table: %s\n",
> + "\t\t\tport_num............%u\n\tP_Key Table: %s\n",
> cl_ntoh64(port_guid), block_num, port_num, buf_line);
> }
> }
> @@ -1621,8 +1621,8 @@ osm_dump_slvl_map_table(IN osm_log_t * const p_log,
> osm_log(p_log, log_level,
> "SLtoVL dump:\n"
> "\t\t\tport_guid............0x%016" PRIx64 "\n"
> - "\t\t\tin_port_num..........0x%X\n"
> - "\t\t\tout_port_num.........0x%X\n\tSL: | %s\n\tVL: | %s\n",
> + "\t\t\tin_port_num..........%u\n"
> + "\t\t\tout_port_num.........%u\n\tSL: | %s\n\tVL: | %s\n",
> cl_ntoh64(port_guid),
> in_port_num, out_port_num, buf_line1, buf_line2);
> }
> @@ -1651,7 +1651,7 @@ osm_dump_vl_arb_table(IN osm_log_t * const p_log,
> osm_log(p_log, log_level,
> "VLArb dump:\n" "\t\t\tport_guid...........0x%016"
> PRIx64 "\n" "\t\t\tblock_num...........0x%X\n"
> - "\t\t\tport_num............0x%X\n\tVL : | %s\n\tWEIGHT:| %s\n",
> + "\t\t\tport_num............%u\n\tVL : | %s\n\tWEIGHT:| %s\n",
> cl_ntoh64(port_guid), block_num, port_num, buf_line1,
> buf_line2);
> }
> diff --git a/opensm/opensm/osm_link_mgr.c b/opensm/opensm/osm_link_mgr.c
> index 452d151..98870cb 100644
> --- a/opensm/opensm/osm_link_mgr.c
> +++ b/opensm/opensm/osm_link_mgr.c
> @@ -377,7 +377,7 @@ __osm_link_mgr_process_node(osm_sm_t * sm,
> if (link_state != IB_LINK_NO_CHANGE &&
> link_state <= current_state)
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> - "Physical port 0x%X already %s. Skipping\n",
> + "Physical port %u already %s. Skipping\n",
> p_physp->port_num,
> ib_get_port_state_str(current_state));
> else if (__osm_link_mgr_set_physp_pi(sm, p_physp, link_state))
> diff --git a/opensm/opensm/osm_mcast_mgr.c b/opensm/opensm/osm_mcast_mgr.c
> index fc8533d..c4cd632 100644
> --- a/opensm/opensm/osm_mcast_mgr.c
> +++ b/opensm/opensm/osm_mcast_mgr.c
> @@ -628,7 +628,7 @@ static osm_mtree_node_t *__osm_mcast_mgr_branch(osm_sm_t * sm,
> */
> if (depth > 1) {
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> - "Adding upstream port 0x%X\n", upstream_port);
> + "Adding upstream port %u\n", upstream_port);
>
> CL_ASSERT(upstream_port);
> osm_mcast_tbl_set(p_tbl, mlid_ho, upstream_port);
> @@ -662,7 +662,7 @@ static osm_mtree_node_t *__osm_mcast_mgr_branch(osm_sm_t * sm,
> continue; /* No routes down this port. */
>
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> - "Routing %zu destinations via switch port 0x%X\n",
> + "Routing %zu destinations via switch port %u\n",
> count, i);
>
> /*
> @@ -716,7 +716,7 @@ static osm_mtree_node_t *__osm_mcast_mgr_branch(osm_sm_t * sm,
>
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> "Found leaf for port 0x%016" PRIx64
> - " on switch port 0x%X\n",
> + " on switch port %u\n",
> cl_ntoh64(osm_port_get_guid (p_wobj->p_port)),
> i);
>
> diff --git a/opensm/opensm/osm_node_info_rcv.c b/opensm/opensm/osm_node_info_rcv.c
> index 86710d1..a37ce0a 100644
> --- a/opensm/opensm/osm_node_info_rcv.c
> +++ b/opensm/opensm/osm_node_info_rcv.c
> @@ -217,7 +217,7 @@ __osm_ni_rcv_set_links(IN osm_sm_t * sm,
> port_num != 0 && cl_qmap_count(&sm->p_subn->sw_guid_tbl) == 0) {
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> "Duplicate GUID found by link from a port to itself:"
> - "node 0x%" PRIx64 ", port number 0x%X\n",
> + "node 0x%" PRIx64 ", port number %u\n",
> cl_ntoh64(osm_node_get_node_guid(p_node)), port_num);
> p_physp = osm_node_get_physp_ptr(p_node, port_num);
> osm_dump_dr_path(sm->p_log,
> @@ -235,8 +235,8 @@ __osm_ni_rcv_set_links(IN osm_sm_t * sm,
>
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> "Creating new link between:\n\t\t\t\tnode 0x%" PRIx64
> - ", port number 0x%X and\n\t\t\t\tnode 0x%" PRIx64
> - ", port number 0x%X\n",
> + ", port number %u and\n\t\t\t\tnode 0x%" PRIx64
> + ", port number %u\n",
> cl_ntoh64(osm_node_get_node_guid(p_node)), port_num,
> cl_ntoh64(p_ni_context->node_guid), p_ni_context->port_num);
>
> diff --git a/opensm/opensm/osm_perfmgr.c b/opensm/opensm/osm_perfmgr.c
> index 8d292ab..a168f89 100644
> --- a/opensm/opensm/osm_perfmgr.c
> +++ b/opensm/opensm/osm_perfmgr.c
> @@ -219,7 +219,7 @@ osm_perfmgr_mad_send_err_callback(void *bind_context, osm_madw_t * p_madw)
> p_mon_node = (__monitored_node_t *) p_node;
>
> OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 4C02: %s (0x%" PRIx64
> - ") port %d\n", p_mon_node->name, p_mon_node->guid, port);
> + ") port %u\n", p_mon_node->name, p_mon_node->guid, port);
>
> if (pm->subn->opt.perfmgr_redir && p_madw->status == IB_TIMEOUT) {
> /* First, find the node in the monitored map */
> @@ -228,8 +228,8 @@ osm_perfmgr_mad_send_err_callback(void *bind_context, osm_madw_t * p_madw)
> if (port > p_mon_node->redir_tbl_size) {
> cl_plock_release(pm->lock);
> OSM_LOG(pm->log, OSM_LOG_ERROR, "ERR 4C16: "
> - "Invalid port num %d for %s (GUID 0x%016"
> - PRIx64 ") num ports %d\n", port, p_mon_node->name,
> + "Invalid port num %u for %s (GUID 0x%016"
> + PRIx64 ") num ports %u\n", port, p_mon_node->name,
> p_mon_node->guid, p_mon_node->redir_tbl_size);
> goto Exit;
> }
> diff --git a/opensm/opensm/osm_pkey_rcv.c b/opensm/opensm/osm_pkey_rcv.c
> index 9e09806..d845c20 100644
> --- a/opensm/opensm/osm_pkey_rcv.c
> +++ b/opensm/opensm/osm_pkey_rcv.c
> @@ -127,7 +127,7 @@ void osm_pkey_rcv_process(IN void *context, IN void *data)
> */
> if (!p_physp) {
> OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 4807: "
> - "Got invalid port number 0x%X\n", port_num);
> + "Got invalid port number %u\n", port_num);
> goto Exit;
> }
>
> diff --git a/opensm/opensm/osm_port.c b/opensm/opensm/osm_port.c
> index 54a5fd1..48a12f9 100644
> --- a/opensm/opensm/osm_port.c
> +++ b/opensm/opensm/osm_port.c
> @@ -322,7 +322,7 @@ osm_physp_calc_link_mtu(IN osm_log_t * p_log, IN const osm_physp_t * p_physp)
> ib_port_info_get_mtu_cap(&p_remote_physp->port_info);
>
> OSM_LOG(p_log, OSM_LOG_DEBUG,
> - "Remote port 0x%016" PRIx64 " port = 0x%X : "
> + "Remote port 0x%016" PRIx64 " port = %u : "
> "MTU = %u. This Port MTU: %u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_remote_physp)),
> osm_physp_get_port_num(p_remote_physp),
> @@ -334,8 +334,8 @@ osm_physp_calc_link_mtu(IN osm_log_t * p_log, IN const osm_physp_t * p_physp)
>
> OSM_LOG(p_log, OSM_LOG_VERBOSE,
> "MTU mismatch between ports."
> - "\n\t\t\t\tPort 0x%016" PRIx64 ", port 0x%X"
> - " and port 0x%016" PRIx64 ", port 0x%X."
> + "\n\t\t\t\tPort 0x%016" PRIx64 ", port %u"
> + " and port 0x%016" PRIx64 ", port %u."
> "\n\t\t\t\tUsing lower MTU of %u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_physp)),
> osm_physp_get_port_num(p_physp),
> @@ -769,7 +769,7 @@ osm_physp_set_pkey_tbl(IN osm_log_t * p_log,
> if (block_num >= max_blocks) {
> OSM_LOG(p_log, OSM_LOG_ERROR, "ERR 4108: "
> "Got illegal set for block number:%u "
> - "For GUID: %" PRIx64 " port number:0x%X\n",
> + "For GUID: %" PRIx64 " port number:%u\n",
> block_num,
> cl_ntoh64(p_physp->p_node->node_info.node_guid),
> p_physp->port_num);
> diff --git a/opensm/opensm/osm_port_info_rcv.c b/opensm/opensm/osm_port_info_rcv.c
> index a820069..73afd8e 100644
> --- a/opensm/opensm/osm_port_info_rcv.c
> +++ b/opensm/opensm/osm_port_info_rcv.c
> @@ -235,9 +235,9 @@ __osm_pi_rcv_process_switch_port(IN osm_sm_t * sm,
>
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> "Unlinking local node 0x%" PRIx64
> - ", port 0x%X"
> + ", port %u"
> "\n\t\t\t\tand remote node 0x%" PRIx64
> - ", port 0x%X\n",
> + ", port %u\n",
> cl_ntoh64(osm_node_get_node_guid
> (p_node)), port_num,
> cl_ntoh64(osm_node_get_node_guid
> @@ -292,13 +292,13 @@ __osm_pi_rcv_process_switch_port(IN osm_sm_t * sm,
> ib_get_err_str(status));
> } else
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> - "Skipping SMP responder port 0x%X\n",
> + "Skipping SMP responder port %u\n",
> p_pi->local_port_num);
> break;
>
> default:
> OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 0F03: "
> - "Unknown link state = %u, port = 0x%X\n",
> + "Unknown link state = %u, port = %u\n",
> ib_port_info_get_port_state(p_pi),
> p_pi->local_port_num);
> break;
> @@ -488,7 +488,7 @@ osm_pi_rcv_process_set(IN osm_sm_t * sm, IN osm_node_t * const p_node,
>
> OSM_LOG(sm->p_log, OSM_LOG_DEBUG,
> "Received logical SetResp() for GUID 0x%" PRIx64
> - ", port num 0x%X"
> + ", port num %u"
> "\n\t\t\t\tfor parent node GUID 0x%" PRIx64
> " TID 0x%" PRIx64 "\n",
> cl_ntoh64(port_guid), port_num,
> @@ -598,7 +598,7 @@ void osm_pi_rcv_process(IN void *context, IN void *data)
> most likely due to a subnet sweep in progress.
> */
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> - "Discovered port num 0x%X with GUID 0x%" PRIx64
> + "Discovered port num %u with GUID 0x%" PRIx64
> " for parent node GUID 0x%" PRIx64
> ", TID 0x%" PRIx64 "\n",
> port_num, cl_ntoh64(port_guid),
> @@ -613,7 +613,7 @@ void osm_pi_rcv_process(IN void *context, IN void *data)
> */
> if (!p_physp) {
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> - "Initializing port number 0x%X\n", port_num);
> + "Initializing port number %u\n", port_num);
> p_physp = &p_node->physp_table[port_num];
> osm_physp_init(p_physp,
> port_guid,
> diff --git a/opensm/opensm/osm_sa_link_record.c b/opensm/opensm/osm_sa_link_record.c
> index 9b1ad90..8e74297 100644
> --- a/opensm/opensm/osm_sa_link_record.c
> +++ b/opensm/opensm/osm_sa_link_record.c
> @@ -194,8 +194,8 @@ __osm_lr_rcv_get_physp_link(IN osm_sa_t * sa,
> goto Exit;
>
> OSM_LOG(sa->p_log, OSM_LOG_DEBUG, "Acquiring link record\n"
> - "\t\t\t\tsrc port 0x%" PRIx64 " (port 0x%X)"
> - ", dest port 0x%" PRIx64 " (port 0x%X)\n",
> + "\t\t\t\tsrc port 0x%" PRIx64 " (port %u)"
> + ", dest port 0x%" PRIx64 " (port %u)\n",
> cl_ntoh64(osm_physp_get_port_guid(p_src_physp)), src_port_num,
> cl_ntoh64(osm_physp_get_port_guid(p_dest_physp)),
> dest_port_num);
> diff --git a/opensm/opensm/osm_sa_pkey_record.c b/opensm/opensm/osm_sa_pkey_record.c
> index bba01b4..b694c8c 100644
> --- a/opensm/opensm/osm_sa_pkey_record.c
> +++ b/opensm/opensm/osm_sa_pkey_record.c
> @@ -93,7 +93,7 @@ __osm_sa_pkey_create(IN osm_sa_t * sa,
>
> OSM_LOG(sa->p_log, OSM_LOG_DEBUG,
> "New P_Key table for: port 0x%016" PRIx64
> - ", lid %u, port 0x%X Block:%u\n",
> + ", lid %u, port %u Block:%u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_physp)),
> cl_ntoh16(lid), osm_physp_get_port_num(p_physp), block);
>
> diff --git a/opensm/opensm/osm_sa_portinfo_record.c b/opensm/opensm/osm_sa_portinfo_record.c
> index b263ce8..2ac2611 100644
> --- a/opensm/opensm/osm_sa_portinfo_record.c
> +++ b/opensm/opensm/osm_sa_portinfo_record.c
> @@ -94,7 +94,7 @@ __osm_pir_rcv_new_pir(IN osm_sa_t * sa,
>
> OSM_LOG(sa->p_log, OSM_LOG_DEBUG,
> "New PortInfoRecord: port 0x%016" PRIx64
> - ", lid %u, port 0x%X\n",
> + ", lid %u, port %u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_physp)),
> cl_ntoh16(lid), osm_physp_get_port_num(p_physp));
>
> diff --git a/opensm/opensm/osm_sa_slvl_record.c b/opensm/opensm/osm_sa_slvl_record.c
> index 46b66a6..886cb9b 100644
> --- a/opensm/opensm/osm_sa_slvl_record.c
> +++ b/opensm/opensm/osm_sa_slvl_record.c
> @@ -100,7 +100,7 @@ __osm_sa_slvl_create(IN osm_sa_t * sa,
>
> OSM_LOG(sa->p_log, OSM_LOG_DEBUG,
> "New SLtoVL Map for: OUT port 0x%016" PRIx64
> - ", lid 0x%X, port 0x%X to In Port:%u\n",
> + ", lid 0x%X, port %u to In Port:%u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_physp)),
> cl_ntoh16(lid), osm_physp_get_port_num(p_physp), in_port_idx);
>
> diff --git a/opensm/opensm/osm_sa_vlarb_record.c b/opensm/opensm/osm_sa_vlarb_record.c
> index e2aafc1..ae59b13 100644
> --- a/opensm/opensm/osm_sa_vlarb_record.c
> +++ b/opensm/opensm/osm_sa_vlarb_record.c
> @@ -100,7 +100,7 @@ __osm_sa_vl_arb_create(IN osm_sa_t * sa,
>
> OSM_LOG(sa->p_log, OSM_LOG_DEBUG,
> "New VLArbitration for: port 0x%016" PRIx64
> - ", lid %u, port 0x%X Block:%u\n",
> + ", lid %u, port %u Block:%u\n",
> cl_ntoh64(osm_physp_get_port_guid(p_physp)),
> cl_ntoh16(lid), osm_physp_get_port_num(p_physp), block);
>
> diff --git a/opensm/opensm/osm_slvl_map_rcv.c b/opensm/opensm/osm_slvl_map_rcv.c
> index 000c2a6..e7f1cd2 100644
> --- a/opensm/opensm/osm_slvl_map_rcv.c
> +++ b/opensm/opensm/osm_slvl_map_rcv.c
> @@ -135,7 +135,7 @@ void osm_slvl_rcv_process(IN void *context, IN void *p_data)
> */
> if (!p_physp) {
> OSM_LOG(sm->p_log, OSM_LOG_ERROR,
> - "Got invalid port number 0x%X\n", out_port_num);
> + "Got invalid port number %u\n", out_port_num);
> goto Exit;
> }
>
> diff --git a/opensm/opensm/osm_trap_rcv.c b/opensm/opensm/osm_trap_rcv.c
> index 0213915..b7c2c77 100644
> --- a/opensm/opensm/osm_trap_rcv.c
> +++ b/opensm/opensm/osm_trap_rcv.c
> @@ -129,7 +129,7 @@ osm_trap_rcv_aging_tracker_callback(IN uint64_t key,
> p_physp = get_physp_by_lid_and_num(sm, lid, port_num);
> if (!p_physp)
> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE,
> - "Cannot find port num:0x%X with lid:%u\n",
> + "Cannot find port num:%u with lid:%u\n",
> port_num, lid);
> /* make sure the physp is still valid */
> /* If the health port was false - set it to true */
> diff --git a/opensm/opensm/osm_ucast_mgr.c b/opensm/opensm/osm_ucast_mgr.c
> index bde0c29..be8e724 100644
> --- a/opensm/opensm/osm_ucast_mgr.c
> +++ b/opensm/opensm/osm_ucast_mgr.c
> @@ -152,7 +152,7 @@ __osm_ucast_mgr_process_neighbor(IN osm_ucast_mgr_t * const p_mgr,
>
> OSM_LOG(p_mgr->p_log, OSM_LOG_DEBUG,
> "Node 0x%" PRIx64 ", remote node 0x%" PRIx64
> - ", port 0x%X, remote port 0x%X\n",
> + ", port %u, remote port %u\n",
> cl_ntoh64(osm_node_get_node_guid(p_this_sw->p_node)),
> cl_ntoh64(osm_node_get_node_guid(p_remote_sw->p_node)),
> port_num, remote_port_num);
> @@ -273,7 +273,7 @@ __osm_ucast_mgr_process_port(IN osm_ucast_mgr_t * const p_mgr,
> osm_physp_t *p = osm_node_get_physp_ptr(p_sw->p_node, port);
>
> OSM_LOG(p_mgr->p_log, OSM_LOG_DEBUG,
> - "Routing LID %u to port 0x%X"
> + "Routing LID %u to port %u"
> " for switch 0x%" PRIx64 "\n",
> lid_ho, port, cl_ntoh64(node_guid));
>
> diff --git a/opensm/opensm/osm_vl_arb_rcv.c b/opensm/opensm/osm_vl_arb_rcv.c
> index 725cc3b..674c2d6 100644
> --- a/opensm/opensm/osm_vl_arb_rcv.c
> +++ b/opensm/opensm/osm_vl_arb_rcv.c
> @@ -132,7 +132,7 @@ void osm_vla_rcv_process(IN void *context, IN void *data)
> */
> if (!p_physp) {
> OSM_LOG(sm->p_log, OSM_LOG_ERROR,
> - "Got invalid port number 0x%X\n", port_num);
> + "Got invalid port number %u\n", port_num);
> goto Exit;
> }
>
More information about the general
mailing list