[ofa-general] [PATCH][TRIVIAL] OpenSM/osm_ucast_ftree.c: Change HCA to CA in log messages

Hal Rosenstock halr at voltaire.com
Mon May 14 06:13:05 PDT 2007


OpenSM/osm_ucast_ftree.c: Change HCA to CA in log messages

Signed-off-by: Hal Rosenstock <halr at voltaire.com>

diff --git a/osm/opensm/osm_ucast_ftree.c b/osm/opensm/osm_ucast_ftree.c
index 3bad2fc..eb33e5a 100644
--- a/osm/opensm/osm_ucast_ftree.c
+++ b/osm/opensm/osm_ucast_ftree.c
@@ -850,7 +850,7 @@ __osm_ftree_hca_dump(
 
    osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
            "__osm_ftree_hca_dump: "
-           "HCA GUID: 0x%016" PRIx64 ", Ports: %u UP\n",
+           "CA GUID: 0x%016" PRIx64 ", Ports: %u UP\n",
           cl_ntoh64(osm_node_get_node_guid(p_hca->p_osm_node)), 
           p_hca->up_port_groups_num);
 
@@ -1124,7 +1124,7 @@ __osm_ftree_fabric_dump(ftree_fabric_t *
            "                       |-------------------------------|\n\n");
 
    osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
-           "__osm_ftree_fabric_dump: -- HCAs:\n");
+           "__osm_ftree_fabric_dump: -- CAs:\n");
 
    for ( p_hca = (ftree_hca_t *)cl_qmap_head(&p_ftree->hca_tbl);
          p_hca != (ftree_hca_t *)cl_qmap_end(&p_ftree->hca_tbl);
@@ -1174,7 +1174,7 @@ __osm_ftree_fabric_dump_general_info(
            p_ftree->tree_rank);
    osm_log(&p_ftree->p_osm->log, OSM_LOG_INFO,
            "__osm_ftree_fabric_dump_general_info: "
-           "  - Fabric has %u HCAs, %u switches\n",
+           "  - Fabric has %u CAs, %u switches\n",
            cl_qmap_count(&p_ftree->hca_tbl),
            cl_qmap_count(&p_ftree->sw_tbl));
 
@@ -1886,7 +1886,7 @@ __osm_ftree_fabric_route_upgoing_by_goin
                                             p_min_port->remote_port_num);
          osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
                  "__osm_ftree_fabric_route_upgoing_by_going_down: "
-                 "Switch %s: set path to HCA LID 0x%x through port %u\n",
+                 "Switch %s: set path to CA LID 0x%x through port %u\n",
                  __osm_ftree_tuple_to_str(p_remote_sw->tuple),
                  cl_ntoh16(target_lid),
                  p_min_port->remote_port_num);
@@ -2067,7 +2067,7 @@ __osm_ftree_fabric_route_downgoing_by_go
       {
          osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
                  "__osm_ftree_fabric_route_downgoing_by_going_up: "
-                 " - Routing MAIN path for %s HCA LID 0x%x: %s --> %s\n",
+                 " - Routing MAIN path for %s CA LID 0x%x: %s --> %s\n",
                  (is_real_lid)? "real" : "DUMMY",
                  cl_ntoh16(target_lid),
                  __osm_ftree_tuple_to_str(p_sw->tuple),
@@ -2084,7 +2084,7 @@ __osm_ftree_fabric_route_downgoing_by_go
                                             p_min_port->remote_port_num);
          osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
                  "__osm_ftree_fabric_route_downgoing_by_going_up: "
-                 "Switch %s: set path to HCA LID 0x%x through port %u\n",
+                 "Switch %s: set path to CA LID 0x%x through port %u\n",
                  __osm_ftree_tuple_to_str(p_remote_sw->tuple),
                  cl_ntoh16(target_lid),p_min_port->remote_port_num);
 
@@ -2250,7 +2250,7 @@ __osm_ftree_fabric_route_to_hcas(
                                             p_port->port_num);
          osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
                  "__osm_ftree_fabric_route_to_hcas: "
-                 "Switch %s: set path to HCA LID 0x%x through port %u\n",
+                 "Switch %s: set path to CA LID 0x%x through port %u\n",
                  __osm_ftree_tuple_to_str(p_sw->tuple),
                  cl_ntoh16(remote_lid),
                  p_port->port_num);
@@ -2279,7 +2279,7 @@ __osm_ftree_fabric_route_to_hcas(
       if (p_ftree->max_hcas_per_leaf > p_sw->down_port_groups_num)
       {
          osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,"__osm_ftree_fabric_route_to_hcas: "
-                 "Routing %u dummy HCAs\n",
+                 "Routing %u dummy CAs\n",
                  p_ftree->max_hcas_per_leaf - p_sw->down_port_groups_num);
          for ( j = 0;
                ((int)j) < (p_ftree->max_hcas_per_leaf - p_sw->down_port_groups_num);
@@ -2503,7 +2503,7 @@ __osm_ftree_rank_switches_from_hca(
             /* HCA connected directly to another HCA - not FatTree */
             osm_log(&p_ftree->p_osm->log, OSM_LOG_ERROR,
                     "__osm_ftree_rank_switches_from_hca: ERR AB0F: "
-                    "HCA conected directly to another HCA: "
+                    "CA conected directly to another CA: "
                     "0x%016" PRIx64 " <---> 0x%016" PRIx64 "\n",
                     cl_ntoh64(osm_node_get_node_guid(p_hca->p_osm_node)),
                     cl_ntoh64(osm_node_get_node_guid(p_remote_osm_node)));
@@ -2540,8 +2540,8 @@ __osm_ftree_rank_switches_from_hca(
 
       osm_log(&p_ftree->p_osm->log, OSM_LOG_DEBUG,
               "__osm_ftree_rank_switches_from_hca: "
-              "Marking rank of switch that is directly connected to HCA:\n"
-              "                                            - HCA guid   : 0x%016" PRIx64 "\n"
+              "Marking rank of switch that is directly connected to CA:\n"
+              "                                            - CA guid    : 0x%016" PRIx64 "\n"
               "                                            - Switch guid: 0x%016" PRIx64 "\n"
               "                                            - Switch LID : 0x%x\n",
               cl_ntoh64(osm_node_get_node_guid(p_hca->p_osm_node)),
@@ -2613,7 +2613,7 @@ __osm_ftree_fabric_construct_hca_ports(
             /* HCA connected directly to another HCA - not FatTree */
             osm_log(&p_ftree->p_osm->log, OSM_LOG_ERROR,
                     "__osm_ftree_fabric_construct_hca_ports: ERR AB11: "
-                    "HCA conected directly to another HCA: "
+                    "CA conected directly to another CA: "
                     "0x%016" PRIx64 " <---> 0x%016" PRIx64 "\n",
                     cl_ntoh64(osm_node_get_node_guid(p_node)),
                     cl_ntoh64(remote_node_guid));
@@ -2939,7 +2939,7 @@ __osm_ftree_construct_fabric(
 
    osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
            "__osm_ftree_construct_fabric: "
-           "Populating FatTree Switch and HCA tables\n");
+           "Populating FatTree Switch and CA tables\n");
    if (__osm_ftree_fabric_populate_nodes(p_ftree) != 0)
    {
       osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS,
@@ -2952,7 +2952,7 @@ __osm_ftree_construct_fabric(
    if (cl_qmap_count(&p_ftree->hca_tbl) < 2)
    {
       osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS,
-              "Fabric has %u HCAa - topology is not fat-tree.\n"
+              "Fabric has %u CAa - topology is not fat-tree.\n"
               "Falling back to default routing.\n",
               cl_qmap_count(&p_ftree->hca_tbl));
       status = -1;
@@ -2983,7 +2983,7 @@ __osm_ftree_construct_fabric(
       we want the ports to have pointers to ftree_{sw,hca}_t objects.*/
    osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,
            "__osm_ftree_construct_fabric: "
-           "Populating HCA & switch ports\n");
+           "Populating CA & switch ports\n");
    if (__osm_ftree_fabric_populate_ports(p_ftree) != 0)
    {
       osm_log(&p_ftree->p_osm->log, OSM_LOG_SYS,
@@ -3061,7 +3061,7 @@ __osm_ftree_do_routing(
            "Starting FatTree routing\n");
 
    osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,"__osm_ftree_do_routing: "
-           "Filling switch forwarding tables for routes to HCAs\n");
+           "Filling switch forwarding tables for routes to CAs\n");
    __osm_ftree_fabric_route_to_hcas(p_ftree);
 
    osm_log(&p_ftree->p_osm->log, OSM_LOG_VERBOSE,"__osm_ftree_do_routing: "






More information about the general mailing list