app,sched: fix pxsch_rbs_per_tdd_slot_idx + pci

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

apps/helpers/metrics/json_generators/du_high/scheduler.cpp

@@ -109,6 +109,7 @@ void to_json(nlohmann::json& json, const scheduler_cell_metrics& metrics)
 {
   // Cell metrics.
   auto& cell_json                      = json["cell_metrics"];
+  cell_json["pci"]                     = metrics.pci;
   cell_json["error_indication_count"]  = metrics.nof_error_indications;
   cell_json["average_latency"]         = metrics.average_decision_latency.count();
   cell_json["max_latency"]             = metrics.max_decision_latency.count();

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

@@ -229,13 +229,13 @@ void scheduler_cell_metrics_consumer_log::handle_metric(const std::optional<sche
         cell.nof_failed_pdsch_allocs_late_harqs,
         cell.nof_failed_pusch_allocs_late_harqs,
         cell.pucch_tot_rb_usage_avg);
-    if (cell.pusch_prbs_used_per_tdd_slot_idx.size()) {
+    if (not cell.pusch_prbs_used_per_tdd_slot_idx.empty()) {
       fmt::format_to(
           std::back_inserter(buffer),
           " pusch_rbs_per_tdd_slot_idx=[{}]",
           fmt::join(cell.pusch_prbs_used_per_tdd_slot_idx.begin(), cell.pusch_prbs_used_per_tdd_slot_idx.end(), ", "));
     }
-    if (cell.pdsch_prbs_used_per_tdd_slot_idx.size()) {
+    if (not cell.pdsch_prbs_used_per_tdd_slot_idx.empty()) {
       fmt::format_to(
           std::back_inserter(buffer),
           " pdsch_rbs_per_tdd_slot_idx=[{}]",

include/srsran/scheduler/scheduler_metrics.h

@@ -169,7 +169,7 @@ struct scheduler_cell_metrics {
   std::chrono::microseconds               max_decision_latency{0};
   slot_point                              max_decision_latency_slot;
   std::array<unsigned, latency_hist_bins> latency_histogram{0};
-  /// Number of RBs used for PUSCH per slot index in the TDD pattern.
+  /// Average number of RBs used for PUSCH per slot index in the TDD pattern.
   std::vector<unsigned>             pusch_prbs_used_per_tdd_slot_idx;
   std::vector<unsigned>             pdsch_prbs_used_per_tdd_slot_idx;
   std::vector<scheduler_cell_event> events;

lib/scheduler/logging/scheduler_metrics_handler.cpp

@@ -431,13 +431,23 @@ void cell_metrics_handler::report_metrics()
   // Note: PUCCH is only allocated on full UL slots.
   next_report->pucch_tot_rb_usage_avg =
       data.nof_ul_slots > 0 ? static_cast<float>(data.pucch_rbs_used) / data.nof_ul_slots : 0;
-  for (unsigned rb_count : ul_prbs_used_per_tdd_slot_idx) {
-    next_report->pusch_prbs_used_per_tdd_slot_idx.push_back(rb_count);
-  }
-  for (unsigned rb_count : dl_prbs_used_per_tdd_slot_idx) {
-    next_report->pdsch_prbs_used_per_tdd_slot_idx.push_back(rb_count);
-  }
+  if (cell_cfg.tdd_cfg_common.has_value()) {
+    const float nof_tdd_periods_per_metric_report =
+        static_cast<float>(next_report->nof_slots) /
+        static_cast<float>(nof_slots_per_tdd_period(cell_cfg.tdd_cfg_common.value()));
+
+    for (unsigned rb_count : ul_prbs_used_per_tdd_slot_idx) {
+      const auto avg_nof_rbs =
+          static_cast<unsigned>(std::round(static_cast<float>(rb_count) / nof_tdd_periods_per_metric_report));
+      next_report->pusch_prbs_used_per_tdd_slot_idx.push_back(avg_nof_rbs);
+    }
 
+    for (unsigned rb_count : dl_prbs_used_per_tdd_slot_idx) {
+      const auto avg_nof_rbs =
+          static_cast<unsigned>(std::round(static_cast<float>(rb_count) / nof_tdd_periods_per_metric_report));
+      next_report->pdsch_prbs_used_per_tdd_slot_idx.push_back(avg_nof_rbs);
+    }
+  }
   // Reset cell-wide metric counters.
   data = {};