[openib-general] [PATCH][MINOR] OpenSM: Fix inconsistent use of osm_log level
Hal Rosenstock
halr at voltaire.com
Tue Jun 6 10:27:07 PDT 2006
OpenSM: Fix inconsistent use of osm_log level
Also, some other cosmetic changes
Signed-off-by: Hal Rosenstock <halr at voltaire.com>
Index: opensm/osm_pkey_rcv.c
===================================================================
--- opensm/osm_pkey_rcv.c (revision 7733)
+++ opensm/osm_pkey_rcv.c (working copy)
@@ -200,13 +200,10 @@ osm_pkey_rcv_process(
*/
if( !osm_physp_is_valid( p_physp ) )
{
- if( osm_log_is_active( p_rcv->p_log, OSM_LOG_VERBOSE ) )
- {
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pkey_rcv_process: ERR 4807: "
- "Got invalid port number 0x%X\n",
- port_num );
- }
+ osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ "osm_pkey_rcv_process: ERR 4807: "
+ "Got invalid port number 0x%X\n",
+ port_num );
goto Exit;
}
Index: opensm/osm_sa_guidinfo_record.c
===================================================================
--- opensm/osm_sa_guidinfo_record.c (revision 7733)
+++ opensm/osm_sa_guidinfo_record.c (working copy)
@@ -171,7 +171,7 @@ __osm_gir_rcv_new_gir(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_gir_rcv_new_gir: "
"New GUIDInfoRecord: lid 0x%X, block num %d\n",
cl_ntoh16( match_lid ), block_num );
@@ -220,7 +220,7 @@ __osm_sa_gir_create_gir(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_gir_create_gir: "
"Looking for GUIDRecord with LID: 0x%X GUID:0x%016" PRIx64 "\n",
cl_ntoh16( match_lid ),
@@ -282,7 +282,7 @@ __osm_sa_gir_create_gir(
*/
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_gir_create_gir: "
"Comparing LID: 0x%X <= 0x%X <= 0x%X\n",
cl_ntoh16( base_lid_ho ),
@@ -495,7 +495,7 @@ osm_gir_rcv_process(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_gir_rcv_process: "
+ "osm_gir_rcv_process: ERR 5103: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_sa_vlarb_record.c
===================================================================
--- opensm/osm_sa_vlarb_record.c (revision 7733)
+++ opensm/osm_sa_vlarb_record.c (working copy)
@@ -179,7 +179,7 @@ __osm_sa_vl_arb_create(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_vl_arb_create: "
"New VLArbitration for: port 0x%016" PRIx64
", lid 0x%X, port# 0x%X Block:%u\n",
@@ -416,7 +416,7 @@ osm_vlarb_rec_rcv_process(
else
{ /* port out of range */
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_vlarb_rec_rcv_process: "
+ "osm_vlarb_rec_rcv_process: ERR 2A01: "
"Given LID (%u) is out of range:%u\n",
cl_ntoh16(p_rcvd_rec->lid), cl_ptr_vector_get_size(p_tbl) );
}
@@ -444,7 +444,7 @@ osm_vlarb_rec_rcv_process(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_vlarb_rec_rcv_process: "
+ "osm_vlarb_rec_rcv_process: ERR 2A08: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_sa_multipath_record.c
===================================================================
--- opensm/osm_sa_multipath_record.c (revision 7733)
+++ opensm/osm_sa_multipath_record.c (working copy)
@@ -1281,7 +1281,8 @@ __osm_mpr_rcv_process_pairs(
max_paths - total_paths,
comp_mask, p_list );
total_paths += num_paths;
- osm_log( p_rcv->p_log, OSM_LOG_DEBUG, "__osm_mpr_rcv_process_pairs: "
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
+ "__osm_mpr_rcv_process_pairs: "
"%d paths %d total paths %d max paths\n",
num_paths, total_paths, max_paths );
/* Just take first NumbPaths found */
@@ -1468,7 +1469,8 @@ osm_mpr_rcv_process(
if ( sa_status != IB_SA_MAD_STATUS_SUCCESS || !nsrc || !ndest )
{
if ( sa_status == IB_SA_MAD_STATUS_SUCCESS && ( !nsrc || !ndest ) )
- osm_log( p_rcv->p_log, OSM_LOG_ERROR, "osm_mpr_rcv_process_cb: ERR 4512: "
+ osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ "osm_mpr_rcv_process_cb: ERR 4512: "
"__osm_mpr_rcv_get_end_points failed, not enough GIDs "
"(nsrc %d ndest %d)\n",
nsrc, ndest);
Index: opensm/osm_subnet.c
===================================================================
--- opensm/osm_subnet.c (revision 7733)
+++ opensm/osm_subnet.c (working copy)
@@ -250,7 +250,7 @@ osm_get_gid_by_mad_addr(
if ( p_gid == NULL )
{
osm_log( p_log, OSM_LOG_ERROR,
- "osm_get_gid_by_mad_addr: ERR 7505 "
+ "osm_get_gid_by_mad_addr: ERR 7505: "
"Provided output GID is NULL\n");
return(IB_INVALID_PARAMETER);
}
@@ -281,7 +281,7 @@ osm_get_gid_by_mad_addr(
{
/* The dest_lid is not in the subnet table - this is an error */
osm_log( p_log, OSM_LOG_ERROR,
- "osm_get_gid_by_mad_addr: ERR 7501 "
+ "osm_get_gid_by_mad_addr: ERR 7501: "
"LID is out of range: 0x%X\n",
cl_ntoh16(p_mad_addr->dest_lid)
);
@@ -316,7 +316,7 @@ osm_get_physp_by_mad_addr(
{
/* The port is not in the port_lid table - this is an error */
osm_log( p_log, OSM_LOG_ERROR,
- "osm_get_physp_by_mad_addr: ERR 7502 "
+ "osm_get_physp_by_mad_addr: ERR 7502: "
"Cannot locate port object by lid: 0x%X\n",
cl_ntoh16(p_mad_addr->dest_lid)
);
@@ -329,7 +329,7 @@ osm_get_physp_by_mad_addr(
{
/* The dest_lid is not in the subnet table - this is an error */
osm_log( p_log, OSM_LOG_ERROR,
- "osm_get_physp_by_mad_addr: ERR 7503 "
+ "osm_get_physp_by_mad_addr: ERR 7503: "
"Lid is out of range: 0x%X\n",
cl_ntoh16(p_mad_addr->dest_lid)
);
@@ -365,7 +365,7 @@ osm_get_port_by_mad_addr(
{
/* The dest_lid is not in the subnet table - this is an error */
osm_log( p_log, OSM_LOG_ERROR,
- "osm_get_port_by_mad_addr: ERR 7504 "
+ "osm_get_port_by_mad_addr: ERR 7504: "
"Lid is out of range: 0x%X\n",
cl_ntoh16(p_mad_addr->dest_lid)
);
Index: opensm/osm_sa_lft_record.c
===================================================================
--- opensm/osm_sa_lft_record.c (revision 7733)
+++ opensm/osm_sa_lft_record.c (working copy)
@@ -510,7 +510,7 @@ osm_lftr_rcv_process(
{
osm_log(p_rcv->p_log, OSM_LOG_ERROR,
"osm_lftr_rcv_process: ERR 4411: "
- "osm_vendor_send. status = %s\n",
+ "osm_vendor_send status = %s\n",
ib_get_err_str(status));
goto Exit;
}
Index: opensm/osm_pkey_rcv_ctrl.c
===================================================================
--- opensm/osm_pkey_rcv_ctrl.c (revision 7733)
+++ opensm/osm_pkey_rcv_ctrl.c (working copy)
@@ -110,7 +110,7 @@ osm_pkey_rcv_ctrl_init(
{
osm_log( p_log, OSM_LOG_ERROR,
"osm_pkey_rcv_ctrl_init: ERR 4901: "
- "Dispatcher registration failed.\n" );
+ "Dispatcher registration failed\n" );
status = IB_INSUFFICIENT_RESOURCES;
goto Exit;
}
Index: opensm/osm_sa_service_record.c
===================================================================
--- opensm/osm_sa_service_record.c (revision 7733)
+++ opensm/osm_sa_service_record.c (working copy)
@@ -1115,7 +1115,7 @@ osm_sr_rcv_process(
default:
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"osm_sr_rcv_process: "
- "Bad Method (%s)\n", ib_get_sa_method_str( p_sa_mad->method ));
+ "Bad Method (%s)\n", ib_get_sa_method_str( p_sa_mad->method ) );
osm_sa_send_error( p_rcv->p_resp, p_madw, sa_status );
break;
}
Index: opensm/osm_sa_portinfo_record.c
===================================================================
--- opensm/osm_sa_portinfo_record.c (revision 7733)
+++ opensm/osm_sa_portinfo_record.c (working copy)
@@ -168,7 +168,7 @@ __osm_pir_rcv_new_pir(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_pir_rcv_new_pir: "
"New PortInfoRecord: port 0x%016" PRIx64
", lid 0x%X, port# 0x%X\n",
@@ -678,7 +678,7 @@ osm_pir_rcv_process(
else
{
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pir_rcv_process: "
+ "osm_pir_rcv_process: ERR 2101: "
"Given LID (%u) is out of range:%u\n",
cl_ntoh16(p_rcvd_rec->lid), cl_ptr_vector_get_size(p_tbl));
}
@@ -694,7 +694,7 @@ osm_pir_rcv_process(
else
{
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pir_rcv_process: "
+ "osm_pir_rcv_process: ERR 2103: "
"Given LID (%u) is out of range:%u\n",
cl_ntoh16(p_pi->base_lid), cl_ptr_vector_get_size(p_tbl));
}
@@ -721,7 +721,7 @@ osm_pir_rcv_process(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pir_rcv_process: "
+ "osm_pir_rcv_process: ERR 2108: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
@@ -852,7 +852,7 @@ osm_pir_rcv_process(
{
osm_log(p_rcv->p_log, OSM_LOG_ERROR,
"osm_pir_rcv_process: ERR 2107: "
- "osm_vendor_send. status = %s\n",
+ "osm_vendor_send status = %s\n",
ib_get_err_str(status));
goto Exit;
}
Index: opensm/osm_sa_pkey_record.c
===================================================================
--- opensm/osm_sa_pkey_record.c (revision 7733)
+++ opensm/osm_sa_pkey_record.c (working copy)
@@ -169,7 +169,7 @@ __osm_sa_pkey_create(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_pkey_create: "
"New P_Key table for: port 0x%016" PRIx64
", lid 0x%X, port# 0x%X Block:%u\n",
@@ -432,7 +432,7 @@ osm_pkey_rec_rcv_process(
else
{ /* port out of range */
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pkey_rec_rcv_process: "
+ "osm_pkey_rec_rcv_process: ERR 4609: "
"Given LID (%u) is out of range:%u\n",
cl_ntoh16(p_rcvd_rec->lid), cl_ptr_vector_get_size(p_tbl));
}
@@ -460,7 +460,7 @@ osm_pkey_rec_rcv_process(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_pkey_rec_rcv_process: "
+ "osm_pkey_rec_rcv_process: ERR 460A: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_inform.c
===================================================================
--- opensm/osm_inform.c (revision 7733)
+++ opensm/osm_inform.c (working copy)
@@ -283,7 +283,7 @@ osm_infr_insert_to_db(
"Inserting a new InformInfo Record into Database\n");
osm_log( p_log, OSM_LOG_DEBUG,
"osm_infr_insert_to_db: "
- "Dump before insertion (size : %d) : \n",
+ "Dump before insertion (size : %d)\n",
cl_qlist_count(&p_subn->sa_infr_list) );
__dump_all_informs(p_subn, p_log);
@@ -295,7 +295,7 @@ osm_infr_insert_to_db(
osm_log( p_log, OSM_LOG_DEBUG,
"osm_infr_insert_to_db: "
- "Dump after insertion (size : %d) : \n",
+ "Dump after insertion (size : %d)\n",
cl_qlist_count(&p_subn->sa_infr_list) );
__dump_all_informs(p_subn, p_log);
OSM_LOG_EXIT( p_log );
Index: opensm/osm_sa_slvl_record.c
===================================================================
--- opensm/osm_sa_slvl_record.c (revision 7733)
+++ opensm/osm_sa_slvl_record.c (working copy)
@@ -179,7 +179,7 @@ __osm_sa_slvl_create(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_sa_slvl_create: "
"New SLtoVL Map for: OUT port 0x%016" PRIx64
", lid 0x%X, port# 0x%X to In Port:%u\n",
@@ -395,7 +395,7 @@ osm_slvl_rec_rcv_process(
else
{ /* port out of range */
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_slvl_rec_rcv_process: "
+ "osm_slvl_rec_rcv_process: ERR 2601: "
"Given LID (%u) is out of range:%u\n",
cl_ntoh16(p_rcvd_rec->lid), cl_ptr_vector_get_size(p_tbl));
}
@@ -423,7 +423,7 @@ osm_slvl_rec_rcv_process(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_slvl_rec_rcv_process: "
+ "osm_slvl_rec_rcv_process: ERR 2607: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_mcast_mgr.c
===================================================================
--- opensm/osm_mcast_mgr.c (revision 7738)
+++ opensm/osm_mcast_mgr.c (working copy)
@@ -1130,7 +1130,7 @@ osm_mcast_mgr_process_single(
p_sw_tbl = &p_mgr->p_subn->sw_guid_tbl;
mlid_ho = cl_ntoh16( mlid );
- if( osm_log_is_active( p_mgr->p_log, OSM_LOG_VERBOSE ) )
+ if( osm_log_is_active( p_mgr->p_log, OSM_LOG_DEBUG ) )
{
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"osm_mcast_mgr_process_single: "
@@ -1249,7 +1249,7 @@ osm_mcast_mgr_process_single(
{
if( join_state & IB_JOIN_STATE_SEND_ONLY )
{
- if( osm_log_is_active( p_mgr->p_log, OSM_LOG_VERBOSE ) )
+ if( osm_log_is_active( p_mgr->p_log, OSM_LOG_DEBUG ) )
{
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"osm_mcast_mgr_process_single: "
@@ -1269,7 +1269,7 @@ osm_mcast_mgr_process_single(
}
else
{
- if( osm_log_is_active( p_mgr->p_log, OSM_LOG_VERBOSE ) )
+ if( osm_log_is_active( p_mgr->p_log, OSM_LOG_DEBUG ) )
{
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"osm_mcast_mgr_process_single: "
Index: opensm/osm_trap_rcv.c
===================================================================
--- opensm/osm_trap_rcv.c (revision 7733)
+++ opensm/osm_trap_rcv.c (working copy)
@@ -678,7 +678,7 @@ __osm_trap_rcv_process_sm(
OSM_LOG_ENTER( p_rcv->p_log, __osm_trap_rcv_process_sm );
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "__osm_trap_rcv_process_sm: "
+ "__osm_trap_rcv_process_sm: ERR 3807: "
"This function is not supported yet\n");
OSM_LOG_EXIT( p_rcv->p_log );
@@ -696,7 +696,7 @@ __osm_trap_rcv_process_response(
OSM_LOG_ENTER( p_rcv->p_log, __osm_trap_rcv_process_response );
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "__osm_trap_rcv_process_response: "
+ "__osm_trap_rcv_process_response: ERR 3808: "
"This function is not supported yet\n");
OSM_LOG_EXIT( p_rcv->p_log );
Index: opensm/osm_sa_informinfo.c
===================================================================
--- opensm/osm_sa_informinfo.c (revision 7733)
+++ opensm/osm_sa_informinfo.c (working copy)
@@ -357,14 +357,15 @@ osm_infr_rcv_process_set_method(
p_recvd_inform_info =
(ib_inform_info_t*)ib_sa_mad_get_payload_ptr( p_sa_mad );
- /* the dump routine is not defined yet
- if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
- {
- osm_dump_inform_info_record( p_rcv->p_log,
- p_recvd_service_rec,
- OSM_LOG_DEBUG );
- }
- */
+#if 0
+ /* the dump routine is not implemented yet */
+ if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
+ {
+ osm_dump_inform_info_record( p_rcv->p_log,
+ p_recvd_inform_info,
+ OSM_LOG_DEBUG );
+ }
+#endif
/* Grab the lock */
cl_plock_excl_acquire( p_rcv->p_lock );
Index: opensm/osm_ucast_updn.c
===================================================================
--- opensm/osm_ucast_updn.c (revision 7733)
+++ opensm/osm_ucast_updn.c (working copy)
@@ -879,7 +879,7 @@ osm_subn_calc_up_down_min_hop_table(
if (num_guids == 0)
{
osm_log(&(osm.log), OSM_LOG_ERROR,
- "osm_subn_calc_up_down_min_hop_table: "
+ "osm_subn_calc_up_down_min_hop_table: ERR AA0A: "
"No guids were given or number of guids is 0\n");
return 1;
}
Index: opensm/osm_sa_node_record.c
===================================================================
--- opensm/osm_sa_node_record.c (revision 7733)
+++ opensm/osm_sa_node_record.c (working copy)
@@ -161,7 +161,7 @@ __osm_nr_rcv_new_nr(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_nr_rcv_new_nr: "
"New NodeRecord: node 0x%016" PRIx64
"\n\t\t\t\tport 0x%016" PRIx64 ", lid 0x%X\n",
@@ -211,7 +211,7 @@ __osm_nr_rcv_create_nr(
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_nr_rcv_create_nr: "
"Looking for NodeRecord with LID: 0x%X GUID:0x%016" PRIx64 "\n",
cl_ntoh16( match_lid ),
@@ -257,7 +257,7 @@ __osm_nr_rcv_create_nr(
*/
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_nr_rcv_create_nr: "
"Comparing LID: 0x%X <= 0x%X <= 0x%X\n",
cl_ntoh16( base_lid_ho ),
@@ -326,7 +326,7 @@ __osm_nr_rcv_by_comp_mask(
*/
if( osm_log_is_active( p_rcv->p_log, OSM_LOG_DEBUG ) )
{
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_nr_rcv_by_comp_mask: "
"Looking for node 0x%016" PRIx64
", found 0x%016" PRIx64 "\n",
@@ -493,7 +493,7 @@ osm_nr_rcv_process(
*/
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) && (num_rec > 1) ) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_nr_rcv_process: "
+ "osm_nr_rcv_process: ERR 1D03: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_sa_link_record.c
===================================================================
--- opensm/osm_sa_link_record.c (revision 7733)
+++ opensm/osm_sa_link_record.c (working copy)
@@ -312,7 +312,7 @@ __osm_lr_rcv_get_physp_link(
{
osm_log( p_rcv->p_log, OSM_LOG_DEBUG,
"__osm_lr_rcv_get_physp_link: "
- "Acquiring link record.\n"
+ "Acquiring link record\n"
"\t\t\t\tsrc port 0x%" PRIx64 " (port 0x%X)"
", dest port 0x%" PRIx64 " (port 0x%X)\n",
cl_ntoh64( osm_physp_get_port_guid( p_src_physp ) ),
@@ -606,7 +606,7 @@ __osm_lr_rcv_respond(
if ( (p_rcvd_mad->method == IB_MAD_METHOD_GET) &&
(num_rec > 1)) {
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "__osm_lr_rcv_respond: "
+ "__osm_lr_rcv_respond: ERR 1806: "
"Got more than one record for SubnAdmGet (%u)\n",
num_rec );
osm_sa_send_error( p_rcv->p_resp, p_madw,
Index: opensm/osm_slvl_map_rcv.c
===================================================================
--- opensm/osm_slvl_map_rcv.c (revision 7733)
+++ opensm/osm_slvl_map_rcv.c (working copy)
@@ -211,13 +211,10 @@ osm_slvl_rcv_process(
*/
if( !osm_physp_is_valid( p_physp ) )
{
- if( osm_log_is_active( p_rcv->p_log, OSM_LOG_VERBOSE ) )
- {
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_slvl_rcv_process: "
- "Got invalid port number 0x%X\n",
- out_port_num );
- }
+ osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ "osm_slvl_rcv_process: "
+ "Got invalid port number 0x%X\n",
+ out_port_num );
goto Exit;
}
Index: opensm/osm_sa_link_record_ctrl.c
===================================================================
--- opensm/osm_sa_link_record_ctrl.c (revision 7733)
+++ opensm/osm_sa_link_record_ctrl.c (working copy)
@@ -116,7 +116,7 @@ osm_lr_rcv_ctrl_init(
{
osm_log( p_log, OSM_LOG_ERROR,
"osm_lr_rcv_ctrl_init: ERR 1901: "
- "Dispatcher registration failed.\n" );
+ "Dispatcher registration failed\n" );
status = IB_INSUFFICIENT_RESOURCES;
goto Exit;
}
Index: opensm/osm_qos.c
===================================================================
--- opensm/osm_qos.c (revision 7733)
+++ opensm/osm_qos.c (working copy)
@@ -279,7 +279,8 @@ static ib_api_status_t qos_physp_setup(o
/* setup vl high limit */
status = vl_high_limit_update(p_req, p, qcfg);
if (status != IB_SUCCESS) {
- osm_log(p_log, OSM_LOG_ERROR, "qos_physp_setup: "
+ osm_log(p_log, OSM_LOG_ERROR,
+ "qos_physp_setup: ERR 6201 : "
"failed to update VLHighLimit "
"for port %" PRIx64 " #%d\n",
cl_ntoh64(p->port_guid), port_num);
@@ -289,7 +290,8 @@ static ib_api_status_t qos_physp_setup(o
/* setup VLArbitration */
status = vlarb_update(p_req, p, port_num, qcfg);
if (status != IB_SUCCESS) {
- osm_log(p_log, OSM_LOG_ERROR, "qos_physp_setup: "
+ osm_log(p_log, OSM_LOG_ERROR,
+ "qos_physp_setup: ERR 6202 : "
"failed to update VLArbitration tables "
"for port %" PRIx64 " #%d\n",
cl_ntoh64(p->port_guid), port_num);
@@ -299,7 +301,8 @@ static ib_api_status_t qos_physp_setup(o
/* setup Sl2VL tables */
status = sl2vl_update(p_req, p, port_num, qcfg);
if (status != IB_SUCCESS) {
- osm_log(p_log, OSM_LOG_ERROR, "qos_physp_setup: "
+ osm_log(p_log, OSM_LOG_ERROR,
+ "qos_physp_setup: ERR 6203 : "
"failed to update SL2VLMapping tables "
"for port %" PRIx64 " #%d\n",
cl_ntoh64(p->port_guid), port_num);
Index: opensm/osm_sa_mcmember_record.c
===================================================================
--- opensm/osm_sa_mcmember_record.c (revision 7733)
+++ opensm/osm_sa_mcmember_record.c (working copy)
@@ -2286,7 +2286,7 @@ osm_mcmr_query_mgrp(IN osm_mcmr_recv_t*
{
osm_log( p_rcv->p_log, OSM_LOG_ERROR,
"osm_mcmr_query_mgrp: ERR 1B17: "
- "osm_vendor_send. status = %s\n",
+ "osm_vendor_send status = %s\n",
ib_get_err_str(status) );
goto Exit;
}
Index: opensm/osm_drop_mgr.c
===================================================================
--- opensm/osm_drop_mgr.c (revision 7733)
+++ opensm/osm_drop_mgr.c (working copy)
@@ -512,7 +512,7 @@ __osm_drop_mgr_check_node(
if ( osm_node_get_type( p_node ) != IB_NODE_TYPE_SWITCH )
{
- osm_log( p_mgr->p_log, OSM_LOG_VERBOSE,
+ osm_log( p_mgr->p_log, OSM_LOG_ERROR,
"__osm_drop_mgr_check_node: ERR 0107: "
"Node 0x%016" PRIx64 " is not a switch node\n",
cl_ntoh64( node_guid ) );
Index: opensm/osm_lid_mgr.c
===================================================================
--- opensm/osm_lid_mgr.c (revision 7733)
+++ opensm/osm_lid_mgr.c (working copy)
@@ -637,7 +637,7 @@ __osm_lid_mgr_init_sweep(
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"__osm_lid_mgr_init_sweep: "
"final free lid range [0x%x:0x%x]\n",
- p_range->min_lid, p_range->max_lid);
+ p_range->min_lid, p_range->max_lid );
OSM_LOG_EXIT( p_mgr->p_log );
return status;
@@ -757,7 +757,7 @@ __osm_lid_mgr_find_free_lid_range(
/* if we run out of lids, give an error and abort! */
osm_log( p_mgr->p_log, OSM_LOG_ERROR,
"__osm_lid_mgr_find_free_lid_range: ERR 0307: "
- "OPENSM RAN OUT OF LIDS!!!\n");
+ "OPENSM RAN OUT OF LIDS!!!\n" );
CL_ASSERT( 0 );
}
@@ -827,7 +827,7 @@ __osm_lid_mgr_get_port_lid(
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64" matches its known lid:0x%04x\n",
- guid, min_lid);
+ guid, min_lid );
goto Exit;
}
else
@@ -848,7 +848,7 @@ __osm_lid_mgr_get_port_lid(
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64" has no persistent lid assigned\n",
- guid);
+ guid );
}
/* if the port info carries a lid it must be lmc aligned and not mapped
@@ -872,7 +872,7 @@ __osm_lid_mgr_get_port_lid(
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64" lid range:[0x%x-0x%x] is free\n",
- guid, *p_min_lid, *p_max_lid);
+ guid, *p_min_lid, *p_max_lid );
goto NewLidSet;
}
else
@@ -881,7 +881,7 @@ __osm_lid_mgr_get_port_lid(
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64
" existing lid range:[0x%x:0x%x] is not free\n",
- guid, min_lid, min_lid + num_lids - 1);
+ guid, min_lid, min_lid + num_lids - 1 );
}
}
else
@@ -890,7 +890,7 @@ __osm_lid_mgr_get_port_lid(
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64
" existing lid range:[0x%x:0x%x] is not lmc aligned\n",
- guid, min_lid, min_lid + num_lids - 1);
+ guid, min_lid, min_lid + num_lids - 1 );
}
}
@@ -902,7 +902,7 @@ __osm_lid_mgr_get_port_lid(
osm_log( p_mgr->p_log, OSM_LOG_DEBUG,
"__osm_lid_mgr_get_port_lid: "
"0x%016" PRIx64" assigned a new lid range:[0x%x-0x%x]\n",
- guid, *p_min_lid, *p_max_lid);
+ guid, *p_min_lid, *p_max_lid );
lid_changed = 1;
NewLidSet:
@@ -1339,9 +1339,9 @@ osm_lid_mgr_process_sm(
{
osm_log( p_mgr->p_log, OSM_LOG_VERBOSE,
"osm_lid_mgr_process_sm: "
- "Invoking UI function pfn_ui_pre_lid_assign\n");
+ "Invoking UI function pfn_ui_pre_lid_assign\n" );
p_mgr->p_subn->opt.pfn_ui_pre_lid_assign(
- p_mgr->p_subn->opt.ui_pre_lid_assign_ctx);
+ p_mgr->p_subn->opt.ui_pre_lid_assign_ctx );
}
/* Set the send_set_reqs of the p_mgr to FALSE, and
Index: opensm/osm_pkey_mgr.c
===================================================================
--- opensm/osm_pkey_mgr.c (revision 7733)
+++ opensm/osm_pkey_mgr.c (working copy)
@@ -245,7 +245,7 @@ pkey_mgr_update_peer_port(
if (pkey_mgr_enforce_partition( p_req, peer, enforce ) != IB_SUCCESS)
{
osm_log( p_log, OSM_LOG_ERROR,
- "pkey_mgr_update_peer_port: "
+ "pkey_mgr_update_peer_port: ERR 0502: "
"pkey_mgr_enforce_partition() failed to update "
"node 0x%016" PRIx64 " port %u\n",
cl_ntoh64( osm_node_get_node_guid( p_node ) ),
@@ -272,7 +272,7 @@ pkey_mgr_update_peer_port(
ret_val = TRUE;
else
osm_log( p_log, OSM_LOG_ERROR,
- "pkey_mgr_update_peer_port: "
+ "pkey_mgr_update_peer_port: ERR 0503: "
"pkey_mgr_update_pkey_entry() failed to update "
"pkey table block %d for node 0x%016" PRIx64
" port %u\n",
@@ -332,7 +332,7 @@ static boolean_t pkey_mgr_update_port(
ret_val = TRUE;
else
osm_log( p_log, OSM_LOG_ERROR,
- "pkey_mgr_update_port: "
+ "pkey_mgr_update_port: ERR 0504: "
"pkey_mgr_update_pkey_entry() failed to update "
"pkey table block %d for node 0x%016" PRIx64 " port %u\n",
block_index,
@@ -393,7 +393,8 @@ osm_pkey_mgr_process(
if ( osm_prtn_make_partitions( &p_osm->log, &p_osm->subn ) != IB_SUCCESS )
{
- osm_log( &p_osm->log, OSM_LOG_ERROR, "osm_pkey_mgr_process: "
+ osm_log( &p_osm->log, OSM_LOG_ERROR,
+ "osm_pkey_mgr_process: ERR 0505: "
"osm_prtn_make_partitions() failed\n" );
goto _err;
}
Index: opensm/osm_vl_arb_rcv.c
===================================================================
--- opensm/osm_vl_arb_rcv.c (revision 7733)
+++ opensm/osm_vl_arb_rcv.c (working copy)
@@ -211,13 +211,10 @@ osm_vla_rcv_process(
*/
if( !osm_physp_is_valid( p_physp ) )
{
- if( osm_log_is_active( p_rcv->p_log, OSM_LOG_VERBOSE ) )
- {
- osm_log( p_rcv->p_log, OSM_LOG_ERROR,
- "osm_vla_rcv_process: "
- "Got invalid port number 0x%X\n",
- port_num );
- }
+ osm_log( p_rcv->p_log, OSM_LOG_ERROR,
+ "osm_vla_rcv_process: "
+ "Got invalid port number 0x%X\n",
+ port_num );
goto Exit;
}
More information about the general
mailing list