mac: improve logging of slot_point_extended types

Author: frankist

apps/units/flexible_o_du/o_du_high/du_high/metrics/consumers/mac_metrics_consumers.cpp

@@ -9,6 +9,7 @@
  */
 
 #include "mac_metrics_consumers.h"
+#include "srsran/support/format/custom_formattable.h"
 #include "srsran/support/format/fmt_to_c_str.h"
 
 using namespace srsran;
@@ -37,14 +38,25 @@ void mac_metrics_consumer_log::handle_metric(const mac_dl_metric_report& report)
   for (unsigned i = 0, e = report.cells.size(); i != e; ++i) {
     const mac_dl_cell_metric_report& cell = report.cells[i];
 
-    fmt::format_to(std::back_inserter(buffer),
-                   "MAC cell pci={} metrics: nof_slots={} slot_duration={}usec nof_voluntary_context_switches={} "
-                   "nof_involuntary_context_switches={} ",
-                   static_cast<unsigned>(cell.pci),
-                   cell.nof_slots,
-                   std::round(cell.slot_duration.count() * 1e-3),
-                   cell.count_voluntary_context_switches,
-                   cell.count_involuntary_context_switches);
+    fmt::format_to(
+        std::back_inserter(buffer),
+        "MAC cell pci={} metrics: slots=[{}, {}{}) nof_slots={} slot_duration={}usec nof_voluntary_context_switches={} "
+        "nof_involuntary_context_switches={} ",
+        static_cast<unsigned>(cell.pci),
+        cell.start_slot,
+        cell.start_slot + cell.nof_slots,
+        // Also print the number of HFN wrap-arounds. Useful for long report periods.
+        make_formattable([x = cell.start_slot, n = cell.nof_slots](auto& out) {
+          auto nof_wrap_arounds = (x.count() + n) / x.nof_slots_per_hyper_system_frame();
+          if (nof_wrap_arounds > 0) {
+            return fmt::format_to(out.out(), "(+{} HFNs)", nof_wrap_arounds);
+          }
+          return out.out();
+        }),
+        cell.nof_slots,
+        std::chrono::duration_cast<std::chrono::microseconds>(cell.slot_duration).count(),
+        cell.count_voluntary_context_switches,
+        cell.count_involuntary_context_switches);
 
     write_latency_information(buffer, cell.wall_clock_latency, "wall_clock_latency");
     write_latency_information(buffer, cell.sched_latency, "sched_latency");

include/srsran/ran/slot_point.h

@@ -103,7 +103,7 @@ class slot_point
   constexpr uint32_t slot_index() const { return static_cast<uint32_t>(count_val) % nof_slots_per_frame(); }
 
   /// Radio Frame Number. Value: (0..1023).
-  constexpr uint32_t sfn() const { return static_cast<uint32_t>(count_val) / nof_slots_per_frame(); }
+  constexpr uint32_t sfn() const { return (static_cast<uint32_t>(count_val) / nof_slots_per_frame()) % NOF_SFNS; }
 
   /// Number of slots per hyper system frame. Values: (0..1023).
   constexpr uint32_t nof_slots_per_hyper_system_frame() const { return nof_slots_per_frame() * NOF_SFNS; }
@@ -299,4 +299,5 @@ struct formatter<srsran::slot_point> {
     return format_to(ctx.out(), "{}.{}", slot.sfn(), slot.slot_index());
   }
 };
+
 } // namespace fmt

include/srsran/ran/slot_point_extended.h

@@ -192,3 +192,22 @@ inline slot_point_extended min(slot_point_extended lhs, slot_point_extended rhs)
 }
 
 } // namespace srsran
+
+namespace fmt {
+
+/// FMT formatter of slot_point type.
+template <>
+struct formatter<srsran::slot_point_extended> {
+  template <typename ParseContext>
+  auto parse(ParseContext& ctx)
+  {
+    return ctx.begin();
+  }
+  template <typename FormatContext>
+  auto format(srsran::slot_point_extended slot, FormatContext& ctx) const
+  {
+    return format_to(ctx.out(), "{}.{}.{}", slot.hyper_sfn(), slot.sfn(), slot.slot_index());
+  }
+};
+
+} // namespace fmt

lib/mac/mac_ctrl/mac_metrics_aggregator.cpp

@@ -357,8 +357,8 @@ void mac_metrics_aggregator::try_send_new_report()
   if (ring_elem.start_slot != next_report_start_slot) {
     // Invalid ring slot.
     logger.warning("Discarding metric report for slot={}. Cause: Expected report for slot={}",
-                   ring_elem.start_slot.without_hyper_sfn(),
-                   next_report_start_slot.without_hyper_sfn());
+                   ring_elem.start_slot,
+                   next_report_start_slot);
     return;
   }
 
@@ -367,8 +367,8 @@ void mac_metrics_aggregator::try_send_new_report()
 
   logger.debug("Metric report of {} cells completed for slots=[{}, {})",
                next_report.dl.cells.size(),
-               next_report_start_slot.without_hyper_sfn(),
-               (next_report_start_slot + period_slots).without_hyper_sfn());
+               next_report_start_slot,
+               (next_report_start_slot + period_slots));
 }
 
 void mac_metrics_aggregator::handle_cell_activation(du_cell_index_t cell_index, slot_point_extended report_end_sl_tx)