rlc: cleanup metrics logger to show brate

Author: alvasMan

apps/services/metrics_log_helper.cpp

@@ -208,6 +208,6 @@ void metrics_log_helper::report_metrics(const rlc_metrics& metrics)
   fmt::format_to(buffer, " ue_index={}", metrics.ue_index);
   fmt::format_to(buffer, " rb_id={}", metrics.rb_id);
   fmt::format_to(buffer, " TX=[{}]", format_rlc_tx_metrics(metrics.metrics_period, metrics.tx));
-  fmt::format_to(buffer, " RX=[{}]  ", metrics.rx);
+  fmt::format_to(buffer, " RX=[{}]  ", format_rlc_rx_metrics(metrics.metrics_period, metrics.rx));
   logger.debug("{}", to_c_str(buffer));
 }

include/srsran/rlc/rlc_rx_metrics.h

@@ -75,15 +75,26 @@ inline std::string format_rlc_rx_metrics(timer_duration metrics_period, const rl
 {
   fmt::memory_buffer buffer;
   fmt::format_to(buffer,
-                 "period={}ms num_sdus={} sdu_rate={}kbps num_pdus={} pdu_rate={}kbps "
-                 "ctrl_pdus={}, ctrl_rate={}kbps",
+                 "period={}ms num_sdus={} sdu_rate={}kbps num_pdus={} pdu_rate={}kbps",
                  metrics_period.count(),
                  m.num_sdus,
                  (double)m.num_sdu_bytes * 8 / (double)metrics_period.count(),
                  m.num_pdus,
-                 (double)m.num_pdu_bytes * 8 / (double)metrics_period.count(),
-                 m.mode_specific.am.num_ctrl_pdus,
-                 (double)m.mode_specific.am.num_ctrl_pdu_bytes * 8 / (double)metrics_period.count());
+                 (double)m.num_pdu_bytes * 8 / (double)metrics_period.count());
+  if (m.mode == rlc_mode::tm) {
+    // No TM specific metrics for RX
+  } else if ((m.mode == rlc_mode::um_bidir || m.mode == rlc_mode::um_unidir_ul)) {
+    // Format UM specific metrics for RX
+    fmt::format_to(buffer,
+                   " ctrl_pdus={}, ctrl_rate={}kbps",
+                   m.mode_specific.um.num_sdu_segments,
+                   (double)m.mode_specific.um.num_sdu_segments * 8 / (double)metrics_period.count());
+  } else if (m.mode == rlc_mode::am) {
+    fmt::format_to(buffer,
+                   " ctrl_pdus={}, ctrl_rate={}kbps",
+                   m.mode_specific.am.num_ctrl_pdus,
+                   (double)m.mode_specific.am.num_ctrl_pdu_bytes * 8 / (double)metrics_period.count());
+  }
   return to_c_str(buffer);
 }
 

include/srsran/rlc/rlc_tx_metrics.h

@@ -80,24 +80,35 @@ class rlc_tx_metrics_interface
 inline std::string format_rlc_tx_metrics(timer_duration metrics_period, const rlc_tx_metrics& m)
 {
   fmt::memory_buffer buffer;
-  fmt::format_to(
-      buffer,
-      "period={}ms num_sdus={} sdu_rate={}kbps, dropped_sdus={} discarded_sdus={} "
-      "num_pdus_no_segm={} pdu_rate_no_segm={}kbps num_pdus_with_segm={} pdu_rate_with_segm={}kbps num_retx={} "
-      "retx_rate={}kbps ctrl_pdus={} ctrl_rate={}kbps avg_pdu_latency={}",
-      metrics_period.count(),
-      m.num_sdus,
-      (double)m.num_sdu_bytes * 8 / (double)metrics_period.count(),
-      m.num_dropped_sdus,
-      m.num_discarded_sdus,
-      m.num_pdus_no_segmentation,
-      (double)m.num_pdu_bytes_no_segmentation * 8 / (double)metrics_period.count(),
-      m.mode_specific.am.num_pdus_with_segmentation,
-      (double)m.mode_specific.am.num_pdu_bytes_with_segmentation * 8 / (double)metrics_period.count(),
-      m.mode_specific.am.num_retx_pdus,
-      (double)m.mode_specific.am.num_retx_pdu_bytes * 8 / (double)metrics_period.count(),
-      m.mode_specific.am.num_ctrl_pdus,
-      (double)m.mode_specific.am.num_ctrl_pdu_bytes * 8 / (double)metrics_period.count());
+  fmt::format_to(buffer,
+                 "period={}ms num_sdus={} sdu_rate={}kbps, dropped_sdus={} discarded_sdus={} "
+                 "num_pdus_no_segm={} pdu_rate_no_segm={}kbps",
+                 metrics_period.count(),
+                 m.num_sdus,
+                 (double)m.num_sdu_bytes * 8 / (double)metrics_period.count(),
+                 m.num_dropped_sdus,
+                 m.num_discarded_sdus,
+                 m.num_pdus_no_segmentation,
+                 (double)m.num_pdu_bytes_no_segmentation * 8 / (double)metrics_period.count());
+
+  if (m.mode == rlc_mode::tm) {
+    // No TM specific metrics for RX
+  } else if ((m.mode == rlc_mode::um_bidir || m.mode == rlc_mode::um_unidir_dl)) {
+    fmt::format_to(buffer,
+                   " num_pdus_with_segm={}, pdu_with_segm_rate={}kbps",
+                   m.mode_specific.um.num_pdus_with_segmentation,
+                   (double)m.mode_specific.um.num_pdu_bytes_with_segmentation * 8 / (double)metrics_period.count());
+  } else if (m.mode == rlc_mode::am) {
+    fmt::format_to(buffer,
+                   " num_pdus_with_segm={} pdu_rate_with_segm={}kbps num_retx={} "
+                   "retx_rate={}kbps ctrl_pdus={} ctrl_rate={}kbps",
+                   m.mode_specific.am.num_pdus_with_segmentation,
+                   (double)m.mode_specific.am.num_pdu_bytes_with_segmentation * 8 / (double)metrics_period.count(),
+                   m.mode_specific.am.num_retx_pdus,
+                   (double)m.mode_specific.am.num_retx_pdu_bytes * 8 / (double)metrics_period.count(),
+                   m.mode_specific.am.num_ctrl_pdus,
+                   (double)m.mode_specific.am.num_ctrl_pdu_bytes * 8 / (double)metrics_period.count());
+  }
   return to_c_str(buffer);
 }
 } // namespace srsran