: Refined log output formatting in node module.v4.6.73-20240201

Refined log output formatting in node module.

8 files changed, 33 insertions, 17 deletions

diff --git a/infra/src/pkt_classifier_engine.c b/infra/src/pkt_classifier_engine.c
index 4d36097..169974c 100644
--- a/infra/src/pkt_classifier_engine.c
+++ b/infra/src/pkt_classifier_engine.c
@@ -1509,11 +1509,10 @@ int pkt_classifier_engine_multi_match(struct pkt_classifier_engine * engine, uin
 /* Dump all rules information. */
 void pkt_classifier_engine_info_dump(struct pkt_classifier_engine * engine)
 {
-    /* Dump the fast match info */
-    pkt_classifier_engine_fast_match_info_dump(engine);
-
+    MR_INFO(" ");
     /* Dump the ruleset type */
     enum ruleset_type ruleset_type = pkt_classifier_engine_get_ruleset_type(engine);
+
     if (ruleset_type == RULESET_TYPE_CLASSIFIER)
     {
         MR_INFO("Pkt classifier ruleset type: Classifier");
@@ -1533,4 +1532,7 @@ void pkt_classifier_engine_info_dump(struct pkt_classifier_engine * engine)
     {
         MR_INFO("Pkt classifier engine type: Linear search");
     }
+
+    /* Dump the fast match info */
+    pkt_classifier_engine_fast_match_info_dump(engine);
 }
diff --git a/infra/src/port_adapter_mapping.c b/infra/src/port_adapter_mapping.c
index 73f8af2..adc7171 100644
--- a/infra/src/port_adapter_mapping.c
+++ b/infra/src/port_adapter_mapping.c
@@ -137,6 +137,7 @@ void port_adapter_mapping_dump(void)
         return;
     }
 
+    MR_INFO(" ");
     MR_INFO("Port adapter mapping, nr_maps:%d", g_mapping_mgr->nr_maps);
 
     for (int i = 0; i < RTE_DIM(g_mapping_mgr->port_adapter_maps); i++)
diff --git a/service/src/classifier_rule_parser.c b/service/src/classifier_rule_parser.c
index 490c745..2e8a28e 100644
--- a/service/src/classifier_rule_parser.c
+++ b/service/src/classifier_rule_parser.c
@@ -311,6 +311,12 @@ int pkt_classifier_rule_parser(const struct sc_main * sc, enum ruleset_type rule
 /* Dump all rules information. */
 void classifier_rule_dump(struct rule_list_parsed * rule_list)
 {
+    /* Dump the total rule number */
+    MR_INFO(" ");
+    MR_INFO("Pkt classifier total rules: %u", rule_list->nr_rules);
+    MR_INFO("Pkt classifier total static rules: %u", rule_list->nr_static_rules);
+    MR_INFO("Pkt classifier total dynamic rules: %u", rule_list->nr_dynamic_rules);
+
     for (uint16_t index = 0; index < rule_list->nr_rules; index++)
     {
         char str_rule_info[2048] = {};
@@ -395,9 +401,4 @@ void classifier_rule_dump(struct rule_list_parsed * rule_list)
         }
         MR_INFO("%s", str_rule_info);
     }
-
-    /* Dump the total rule number */
-    MR_INFO("Pkt classifier total rules: %u", rule_list->nr_rules);
-    MR_INFO("Pkt classifier total static rules: %u", rule_list->nr_static_rules);
-    MR_INFO("Pkt classifier total dynamic rules: %u", rule_list->nr_dynamic_rules);
 }
diff --git a/service/src/node_bridge.c b/service/src/node_bridge.c
index 7178c83..73d1051 100644
--- a/service/src/node_bridge.c
+++ b/service/src/node_bridge.c
@@ -144,19 +144,29 @@ void dump_bridge_config(struct node_bridge_main * bridge_main)
     if (bridge_main->nr_bridge == 0)
         return;
 
+    MR_INFO(" ");
     MR_INFO("Bridge config total num: %u", bridge_main->nr_bridge);
 
     for (int index = BRIDGE_START_INDEX; index <= bridge_main->nr_bridge; index++)
     {
-        struct bridge * _bridge_item = &bridge_main->bridge_table[index];
+        struct bridge * bridge_item = &bridge_main->bridge_table[index];
         char str_section[MR_STRING_MAX];
-        int len = 0;
-        for (int i = 0; i < _bridge_item->nr_devices; i++)
+
+        int len = snprintf(str_section, sizeof(str_section), " Port IDs: [");
+
+        for (int i = 0; i < bridge_item->nr_devices; i++)
         {
-            len += snprintf(str_section + len, sizeof(str_section), "[port: %u,mac:" RTE_ETHER_ADDR_PRT_FMT "]",
-                            _bridge_item->ports[i], RTE_ETHER_ADDR_BYTES(&_bridge_item->ether_addr[i]));
+            len += snprintf(str_section + len, sizeof(str_section), "%u", bridge_item->ports[i]);
+
+            if (i < bridge_item->nr_devices - 1)
+            {
+                len += snprintf(str_section + len, sizeof(str_section), ", ");
+            }
         }
-        MR_INFO("Bridge index : %d, devices = %s", index - 1, str_section);
+
+        len += snprintf(str_section + len, sizeof(str_section), "]");
+
+        MR_INFO("Bridge index : %d, %s", index - 1, str_section);
     }
 }
 
diff --git a/service/src/node_etherfabric.c b/service/src/node_etherfabric.c
index 5f87cb5..0a15f52 100644
--- a/service/src/node_etherfabric.c
+++ b/service/src/node_etherfabric.c
@@ -298,6 +298,7 @@ void dump_ef_adapter_config(struct ef_mgr * ef_mgr)
     if (ef_mgr->nr_adapters == 0)
         return;
 
+    MR_INFO(" ");
     MR_INFO("Etherfabric adapter, total num: %u, sid num: %u, sid start: %u, sid end:%u", ef_mgr->nr_adapters,
             ef_mgr->nr_sids, ef_mgr->sid_start, ef_mgr->sid_end);
 
@@ -423,7 +424,7 @@ int ef_peer_lookup_and_add(struct rte_hash * ef_peer_hash, struct ef_peer * ef_p
         char str_mac_addr[RTE_ETHER_ADDR_FMT_SIZE];
         rte_ether_format_addr(str_mac_addr, sizeof(str_mac_addr), &ef_peer_item->ef_mac_addr);
 
-        MR_INFO("ef_peer add, ip addr:%s, mac addr:%s", str_in_addr, str_mac_addr);
+        MR_INFO("Ef Peer add, ip addr:%s, mac addr:%s", str_in_addr, str_mac_addr);
     }
 
     return ret;
diff --git a/service/src/node_health_check.c b/service/src/node_health_check.c
index 43f1ef6..6ac173e 100644
--- a/service/src/node_health_check.c
+++ b/service/src/node_health_check.c
@@ -449,7 +449,7 @@ void dump_health_check_config(struct health_check_main * _health_check_main)
     if (_health_check_main->total_session_num == 0)
         return;
 
-    MR_INFO("\n");
+    MR_INFO(" ");
     /* Dump the health check config */
     MR_INFO("Health check session total number: %u", _health_check_main->total_session_num);
     for (int index = 0; index < _health_check_main->total_session_num; index++)
diff --git a/service/src/node_lb.c b/service/src/node_lb.c
index e70b10e..a474d39 100644
--- a/service/src/node_lb.c
+++ b/service/src/node_lb.c
@@ -363,7 +363,7 @@ void dump_lb_config(struct node_lb_main * lb_main)
     if (lb_main->nr_group == 0)
         return;
 
-    MR_INFO("\n");
+    MR_INFO(" ");
     MR_INFO("Load balance config: total_num=%u, sid_num=%u, sid_start=%u, sid_end=%u.", lb_main->nr_group,
             lb_main->nr_sid, lb_main->sid_start, lb_main->sid_end);
 
diff --git a/service/src/node_tera.c b/service/src/node_tera.c
index b32d937..80dcb97 100644
--- a/service/src/node_tera.c
+++ b/service/src/node_tera.c
@@ -211,6 +211,7 @@ int tera_config_parse(struct sc_main * sc, struct node_tera_main * tera_main)
 /* Tera information dump */
 void tera_info_dump(struct node_tera_main * tera_main)
 {
+    MR_INFO(" ");
     MR_INFO("Tera adapter, total num: %u, sid num:%u, sid_start:%u, sid_end:%u", tera_main->nr_adapters,
             tera_main->nr_sids, tera_main->sid_start, tera_main->sid_end);