Update main

Author: codebot

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

@@ -121,6 +121,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/du_high_config.h

@@ -101,7 +101,7 @@ struct du_high_unit_scheduler_config {
   /// When \c nof_preselected_newtx_ues is lower than the total number of active UEs in the cell, the scheduler will
   /// operate as a hybrid between a Round-Robin scheduler and whichever scheduler policy was selected (e.g. QoS-aware).
   /// This parameter is useful to reduce the complexity of the scheduling decision, at the cost of some performance.
-  unsigned nof_preselected_newtx_ues = 32;
+  unsigned nof_preselected_newtx_ues = 1024;
   /// Scheduler policy employed to prioritize or deprioritize pre-selected UE candidates.
   std::optional<scheduler_policy_config> policy_cfg;
 };

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

@@ -241,13 +241,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

@@ -181,7 +181,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/pdcp/pdcp_entity_rx.cpp

@@ -400,6 +400,7 @@ void pdcp_entity_rx::apply_reordering(pdcp_rx_pdu_info pdu_info)
   // Store PDU in Rx window
   pdcp_rx_sdu_info& sdu_info = rx_window.add_sn(rcvd_count);
   sdu_info.buf               = std::move(pdu_info.buf);
+  sdu_info.count             = pdu_info.count;
   sdu_info.time_of_arrival   = pdu_info.time_of_arrival;
 
   // Update RX_NEXT

lib/phy/lower/lower_phy_factory.cpp

@@ -171,7 +171,7 @@ class lower_phy_factory_sw : public lower_phy_factory
     srsran_assert(controller, "Failed to create the lower PHY controller.");
 
     // Prepare lower PHY configuration.
-    ue_lower_phy_impl::configuration lower_phy_config;
+    lower_phy_impl::configuration lower_phy_config;
     lower_phy_config.downlink_proc      = std::move(dl_proc);
     lower_phy_config.uplink_proc        = std::move(ul_proc);
     lower_phy_config.controller         = std::move(controller);
@@ -180,7 +180,7 @@ class lower_phy_factory_sw : public lower_phy_factory
     lower_phy_config.error_notifier     = config.error_notifier;
     lower_phy_config.metrics_notifier   = config.metric_notifier;
 
-    return std::make_unique<ue_lower_phy_impl>(lower_phy_config);
+    return std::make_unique<lower_phy_impl>(lower_phy_config);
   }
 
 private:

lib/phy/lower/lower_phy_impl.cpp

@@ -25,7 +25,7 @@
 
 using namespace srsran;
 
-ue_lower_phy_impl::ue_lower_phy_impl(configuration& config) :
+lower_phy_impl::lower_phy_impl(configuration& config) :
   downlink_proc(std::move(config.downlink_proc)),
   uplink_proc(std::move(config.uplink_proc)),
   handler_adaptor(downlink_proc->get_downlink_request_handler(),
@@ -54,27 +54,27 @@ ue_lower_phy_impl::ue_lower_phy_impl(configuration& config) :
                        notification_adaptor.get_puxch_notifier());
 }
 
-lower_phy_cfo_controller& ue_lower_phy_impl::get_tx_cfo_control()
+lower_phy_cfo_controller& lower_phy_impl::get_tx_cfo_control()
 {
   return downlink_proc->get_cfo_control();
 }
 
-lower_phy_cfo_controller& ue_lower_phy_impl::get_rx_cfo_control()
+lower_phy_cfo_controller& lower_phy_impl::get_rx_cfo_control()
 {
   return uplink_proc->get_cfo_control();
 }
 
-lower_phy_center_freq_controller& ue_lower_phy_impl::get_tx_center_freq_control()
+lower_phy_center_freq_controller& lower_phy_impl::get_tx_center_freq_control()
 {
   return downlink_proc->get_carrier_center_frequency_control();
 }
 
-lower_phy_center_freq_controller& ue_lower_phy_impl::get_rx_center_freq_control()
+lower_phy_center_freq_controller& lower_phy_impl::get_rx_center_freq_control()
 {
   return uplink_proc->get_carrier_center_frequency_control();
 }
 
-lower_phy_tx_time_offset_controller& ue_lower_phy_impl::get_tx_time_offset_control()
+lower_phy_tx_time_offset_controller& lower_phy_impl::get_tx_time_offset_control()
 {
   return downlink_proc->get_tx_time_offset_control();
 }

lib/phy/lower/lower_phy_impl.h

@@ -46,7 +46,7 @@
 namespace srsran {
 
 /// Lower physical layer implementation.
-class ue_lower_phy_impl : public lower_phy, private lower_phy_controller
+class lower_phy_impl : public lower_phy, private lower_phy_controller
 {
 public:
   /// Collects the injected dependencies of the lower physical layer.
@@ -68,7 +68,7 @@ class ue_lower_phy_impl : public lower_phy, private lower_phy_controller
   };
 
   /// Constructs a generic lower physical layer.
-  ue_lower_phy_impl(configuration& config);
+  lower_phy_impl(configuration& config);
 
   // See interface for documentation.
   lower_phy_controller& get_controller() override { return *this; }

lib/ru/dummy/ru_dummy_sector.h

@@ -87,8 +87,7 @@ class ru_dummy_sector : public ru_uplink_plane_handler, public ru_downlink_plane
 
     // Set the current slot information.
     std::optional<resource_grid_context> late_context =
-        dl_request[context.slot.system_slot() % dl_request.size()].new_request(
-            context, grid.copy(), stop_control.get_token());
+        dl_request[context.slot.system_slot() % dl_request.size()].new_request(context, grid.copy(), std::move(token));
     total_dl_request_count.fetch_add(1, std::memory_order_relaxed);
 
     // If the previous slot is valid, it is a late.
@@ -113,7 +112,7 @@ class ru_dummy_sector : public ru_uplink_plane_handler, public ru_downlink_plane
 
     std::optional<prach_buffer_context> late_context =
         prach_request[context.slot.system_slot() % prach_request.size()].new_request(
-            context, &buffer, stop_control.get_token());
+            context, &buffer, std::move(token));
     total_prach_request_count.fetch_add(1, std::memory_order_relaxed);
 
     // Detect if there is an unhandled request from a different slot.
@@ -136,8 +135,7 @@ class ru_dummy_sector : public ru_uplink_plane_handler, public ru_downlink_plane
     }
 
     std::optional<resource_grid_context> late_context =
-        ul_request[context.slot.system_slot() % ul_request.size()].new_request(
-            context, grid.copy(), stop_control.get_token());
+        ul_request[context.slot.system_slot() % ul_request.size()].new_request(context, grid.copy(), std::move(token));
     total_ul_request_count.fetch_add(1, std::memory_order_relaxed);
 
     // Detect if there is an unhandled request from a different slot.
@@ -303,9 +301,6 @@ class ru_dummy_sector : public ru_uplink_plane_handler, public ru_downlink_plane
       // Transition to available. The object will become available again.
       internal_state.store(internal_states::available);
 
-      // Reset the stop token.
-      local_token.reset();
-
       // Return the context and resource.
       return {current_context, std::move(current_resource)};
     }

lib/scheduler/logging/scheduler_metrics_handler.cpp

@@ -443,13 +443,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 = {};