sched: change filename and replace list with vector

carlo-gal · codebot · commit 7770d8086848 · 2024-03-15T15:17:55.000Z
Signed-off-by: Carlo Galiotto &lt;carlo@srs.io&gt;
diff --git a/lib/scheduler/ue_scheduling/CMakeLists.txt b/lib/scheduler/ue_scheduling/CMakeLists.txt
@@ -17,7 +17,7 @@ set(SOURCES
         ue_cell.cpp
         ue_cell_grid_allocator.cpp
         ue_event_manager.cpp
-        ue_srb0_scheduler.cpp
+        ue_fallback_scheduler.cpp
         ue_scheduler_impl.cpp
         ue_repository.cpp)
 
diff --git a/lib/scheduler/ue_scheduling/ue_event_manager.cpp b/lib/scheduler/ue_scheduling/ue_event_manager.cpp
@@ -632,7 +632,7 @@ void ue_event_manager::run(slot_point sl, du_cell_index_t cell_index)
 }
 
 void ue_event_manager::add_cell(cell_resource_allocator& cell_res_grid,
-                                ue_srb0_scheduler&       srb0_sched,
+                                ue_fallback_scheduler&   srb0_sched,
                                 uci_scheduler_impl&      uci_sched)
 {
   const du_cell_index_t cell_index = cell_res_grid.cell_index();
diff --git a/lib/scheduler/ue_scheduling/ue_event_manager.h b/lib/scheduler/ue_scheduling/ue_event_manager.h
@@ -14,7 +14,7 @@
 #include "../policy/scheduler_policy.h"
 #include "../support/slot_event_list.h"
 #include "ue.h"
-#include "ue_srb0_scheduler.h"
+#include "ue_fallback_scheduler.h"
 #include "srsran/adt/unique_function.h"
 #include "srsran/ran/du_types.h"
 #include "srsran/ran/uci/uci_constants.h"
@@ -36,7 +36,8 @@ class ue_event_manager final : public sched_ue_configuration_handler,
   ue_event_manager(ue_repository& ue_db, scheduler_metrics_handler& metrics_handler, scheduler_event_logger& ev_logger);
   ~ue_event_manager();
 
-  void add_cell(cell_resource_allocator& cell_res_grid, ue_srb0_scheduler& srb0_sched, uci_scheduler_impl& uci_sched);
+  void
+  add_cell(cell_resource_allocator& cell_res_grid, ue_fallback_scheduler& srb0_sched, uci_scheduler_impl& uci_sched);
 
   /// UE Add/Mod/Remove interface.
   void handle_ue_creation(ue_config_update_event ev) override;
@@ -113,7 +114,7 @@ class ue_event_manager final : public sched_ue_configuration_handler,
     cell_resource_allocator* res_grid = nullptr;
 
     // Reference to SRB0 and other bearers scheduler
-    ue_srb0_scheduler* srb0_sched = nullptr;
+    ue_fallback_scheduler* srb0_sched = nullptr;
 
     // Reference to the CSI and SR UCI scheduler.
     uci_scheduler_impl* uci_sched = nullptr;
diff --git a/lib/scheduler/ue_scheduling/ue_fallback_scheduler.cpp b/lib/scheduler/ue_scheduling/ue_fallback_scheduler.cpp
diff --git a/lib/scheduler/ue_scheduling/ue_fallback_scheduler.h b/lib/scheduler/ue_scheduling/ue_fallback_scheduler.h
@@ -21,14 +21,14 @@
 namespace srsran {
 
 /// Defines SRB0 scheduler that is used to allocate grants for UE's SRB0 DL messages in a given slot.
-class ue_srb0_scheduler
+class ue_fallback_scheduler
 {
 public:
-  explicit ue_srb0_scheduler(const scheduler_ue_expert_config& expert_cfg_,
-                             const cell_configuration&         cell_cfg_,
-                             pdcch_resource_allocator&         pdcch_sch_,
-                             pucch_allocator&                  pucch_alloc_,
-                             ue_repository&                    ues_);
+  explicit ue_fallback_scheduler(const scheduler_ue_expert_config& expert_cfg_,
+                                 const cell_configuration&         cell_cfg_,
+                                 pdcch_resource_allocator&         pdcch_sch_,
+                                 pucch_allocator&                  pucch_alloc_,
+                                 ue_repository&                    ues_);
 
   /// Handles DL buffer state reported by upper layers.
   /// \param[in] ue_index UE's DU Index for which SRB0 message needs to be scheduled.
@@ -85,20 +85,21 @@ class ue_srb0_scheduler
                        unsigned                   tbs_bytes,
                        bool                       is_retx);
 
-  void fill_srb1_grant(ue&                        u,
-                       slot_point                 pdsch_slot,
-                       dl_harq_process&           h_dl,
-                       pdcch_dl_information&      pdcch,
-                       dci_dl_rnti_config_type    dci_type,
-                       dl_msg_alloc&              msg,
-                       unsigned                   pucch_res_indicator,
-                       unsigned                   pdsch_time_res,
-                       unsigned                   k1,
-                       sch_mcs_index              mcs_idx,
-                       const crb_interval&        ue_grant_crbs,
-                       const pdsch_config_params& pdsch_params,
-                       unsigned                   tbs_bytes,
-                       bool                       is_retx);
+  void fill_srb_grant(ue&                        u,
+                      slot_point                 pdsch_slot,
+                      dl_harq_process&           h_dl,
+                      pdcch_dl_information&      pdcch,
+                      dci_dl_rnti_config_type    dci_type,
+                      dl_msg_alloc&              msg,
+                      unsigned                   pucch_res_indicator,
+                      unsigned                   pdsch_time_res,
+                      unsigned                   k1,
+                      sch_mcs_index              mcs_idx,
+                      const crb_interval&        ue_grant_crbs,
+                      const pdsch_config_params& pdsch_params,
+                      unsigned                   tbs_bytes,
+                      bool                       is_retx,
+                      bool                       is_srb0);
 
   const pdsch_time_domain_resource_allocation& get_pdsch_td_cfg(unsigned pdsch_time_res_idx) const;
 
@@ -115,27 +116,19 @@ class ue_srb0_scheduler
   {
   public:
     explicit ack_and_retx_tracker(du_ue_index_t ue_idx, dl_harq_process* h_dl_, bool is_srb0_, ue_repository& ues_) :
-      ue_index(ue_idx), is_srb0(is_srb0_), h_dl(h_dl_), ues(ues_)
+      ue_index(ue_idx), is_srb0(is_srb0_), h_dl(h_dl_)
     {
-      srsran_assert(ues.contains(ue_index), "UE not found in the UE repository");
-      srsran_assert(h_dl_ == &(ues[ue_idx].get_pcell().harqs.dl_harq(h_dl_->id)),
-                    "HARQ process not found among the UE HARQs");
     }
+    explicit ack_and_retx_tracker(const ack_and_retx_tracker& other) = default;
 
     bool match_ue_harq(du_ue_index_t ue_idx_, dl_harq_process* h_dl_) const
     {
       return ue_index == ue_idx_ and h_dl == h_dl_;
     }
 
-    // We make the access to the HARQ process is subject to the UE existence in the UE repository.
-    dl_harq_process* get_harq_process() const { return ues.contains(ue_index) ? h_dl : nullptr; }
-
-    du_ue_index_t ue_index;
-    bool          is_srb0;
-
-  private:
+    du_ue_index_t    ue_index;
+    bool             is_srb0;
     dl_harq_process* h_dl;
-    ue_repository&   ues;
   };
 
   void store_harq_tx(du_ue_index_t ue_index, dl_harq_process* h_dl, bool is_srb0);
@@ -167,7 +160,7 @@ class ue_srb0_scheduler
   coreset_configuration      cs_cfg;
 
   /// Cache the UEs that are waiting for SRB HARQ processes to be ACKed or retransmitted.
-  std::list<ack_and_retx_tracker> ongoing_ues_ack_retxs;
+  std::vector<ack_and_retx_tracker> ongoing_ues_ack_retxs;
 
   std::vector<uint8_t> dci_1_0_k1_values;
 
diff --git a/lib/scheduler/ue_scheduling/ue_scheduler_impl.h b/lib/scheduler/ue_scheduling/ue_scheduler_impl.h
@@ -18,9 +18,9 @@
 #include "../uci_scheduling/uci_scheduler_impl.h"
 #include "ue_cell_grid_allocator.h"
 #include "ue_event_manager.h"
+#include "ue_fallback_scheduler.h"
 #include "ue_repository.h"
 #include "ue_scheduler.h"
-#include "ue_srb0_scheduler.h"
 #include "srsran/adt/slotted_array.h"
 #include "srsran/adt/unique_function.h"
 #include "srsran/scheduler/config/scheduler_expert_config.h"
@@ -69,7 +69,7 @@ class ue_scheduler_impl final : public ue_scheduler
     uci_scheduler_impl uci_sched;
 
     /// SRB0 scheduler.
-    ue_srb0_scheduler srb0_sched;
+    ue_fallback_scheduler srb0_sched;
 
     cell(const scheduler_ue_expert_config& expert_cfg, const ue_scheduler_cell_params& params, ue_repository& ues) :
       cell_res_alloc(params.cell_res_alloc),
diff --git a/tests/unittests/scheduler/common_scheduling/paging_scheduler_test.cpp b/tests/unittests/scheduler/common_scheduling/paging_scheduler_test.cpp
@@ -12,7 +12,7 @@
 #include "lib/scheduler/pdcch_scheduling/pdcch_resource_allocator_impl.h"
 #include "lib/scheduler/scheduler_impl.h"
 #include "lib/scheduler/ue_scheduling/ue_cell_grid_allocator.h"
-#include "lib/scheduler/ue_scheduling/ue_srb0_scheduler.h"
+#include "lib/scheduler/ue_scheduling/ue_fallback_scheduler.h"
 #include "tests/unittests/scheduler/test_utils/config_generators.h"
 #include "tests/unittests/scheduler/test_utils/scheduler_test_suite.h"
 #include "srsran/ran/duplex_mode.h"
diff --git a/tests/unittests/scheduler/multiple_ue_sched_test.cpp b/tests/unittests/scheduler/multiple_ue_sched_test.cpp
@@ -10,7 +10,7 @@
 
 #include "lib/scheduler/scheduler_impl.h"
 #include "lib/scheduler/ue_scheduling/ue_cell_grid_allocator.h"
-#include "lib/scheduler/ue_scheduling/ue_srb0_scheduler.h"
+#include "lib/scheduler/ue_scheduling/ue_fallback_scheduler.h"
 #include "test_utils/dummy_test_components.h"
 #include "tests/unittests/scheduler/test_utils/config_generators.h"
 #include "tests/unittests/scheduler/test_utils/scheduler_test_suite.h"
@@ -467,11 +467,11 @@ class scheduler_impl_tester
         uci_indication::uci_pdu::uci_pucch_f0_or_f1_pdu pucch_pdu{};
         if (pucch.format == pucch_format::FORMAT_0) {
           pucch_pdu.sr_detected = sr_nof_bits_to_uint(pucch.format_0.sr_bits) > 0;
-          // Auto ACK latest_harq_states.
+          // Auto ACK harqs.
           pucch_pdu.harqs.resize(pucch.format_0.harq_ack_nof_bits, mac_harq_ack_report_status::ack);
         } else {
           pucch_pdu.sr_detected = sr_nof_bits_to_uint(pucch.format_1.sr_bits) > 0;
-          // Auto ACK latest_harq_states.
+          // Auto ACK harqs.
           pucch_pdu.harqs.resize(pucch.format_1.harq_ack_nof_bits, mac_harq_ack_report_status::ack);
         }
         pucch_pdu.ul_sinr = 55;
@@ -482,7 +482,7 @@ class scheduler_impl_tester
         uci_indication::uci_pdu::uci_pucch_f2_or_f3_or_f4_pdu pucch_pdu{};
         pucch_pdu.sr_info.resize(sr_nof_bits_to_uint(pucch.format_2.sr_bits));
         pucch_pdu.sr_info.fill(0, sr_nof_bits_to_uint(pucch.format_2.sr_bits), true);
-        // Auto ACK latest_harq_states.
+        // Auto ACK harqs.
         pucch_pdu.harqs.resize(pucch.format_2.harq_ack_nof_bits, mac_harq_ack_report_status::ack);
         if (pucch.csi_rep_cfg.has_value()) {
           pucch_pdu.csi.emplace();
diff --git a/tests/unittests/scheduler/test_utils/scheduler_test_suite.cpp b/tests/unittests/scheduler/test_utils/scheduler_test_suite.cpp
@@ -161,7 +161,16 @@ void srsran::assert_pdcch_pdsch_common_consistency(const cell_configuration&
         TESTASSERT(it != rars.end());
         linked_pdsch = &it->pdsch_cfg;
       } break;
-      case dci_dl_rnti_config_type::c_rnti_f1_0:
+      case dci_dl_rnti_config_type::c_rnti_f1_0: {
+        uint8_t k0 =
+            cell_cfg.dl_cfg_common.init_dl_bwp.pdsch_common.pdsch_td_alloc_list[pdcch.dci.c_rnti_f1_0.time_resource].k0;
+        const auto& ue_grants = cell_res_grid[k0].result.dl.ue_grants;
+        auto        it        = std::find_if(ue_grants.begin(), ue_grants.end(), [&pdcch](const auto& grant) {
+          return grant.pdsch_cfg.rnti == pdcch.ctx.rnti;
+        });
+        TESTASSERT(it != ue_grants.end());
+        linked_pdsch = &it->pdsch_cfg;
+      } break;
       case dci_dl_rnti_config_type::tc_rnti_f1_0: {
         uint8_t k0 =
             cell_cfg.dl_cfg_common.init_dl_bwp.pdsch_common.pdsch_td_alloc_list[pdcch.dci.tc_rnti_f1_0.time_resource]
diff --git a/tests/unittests/scheduler/ue_scheduling/CMakeLists.txt b/tests/unittests/scheduler/ue_scheduling/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(ue_scheduler_test
         logical_channel_test.cpp
         harq_entity_test.cpp
         harq_process_test.cpp
-        srb0_scheduler_test.cpp
+        fallback_scheduler_test.cpp
         ue_configuration_test.cpp
         ue_grid_allocator_test.cpp
         ul_logical_channel_test.cpp
diff --git a/tests/unittests/scheduler/ue_scheduling/fallback_scheduler_test.cpp b/tests/unittests/scheduler/ue_scheduling/fallback_scheduler_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ void ue_event_manager::run(slot_point sl, du_cell_index_t cell_index)`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`void ue_event_manager::add_cell(cell_resource_allocator& cell_res_grid,`
`635`		`- ue_srb0_scheduler& srb0_sched,`
	`635`	`+ ue_fallback_scheduler& srb0_sched,`
`636`	`636`	`uci_scheduler_impl& uci_sched)`
`637`	`637`	`{`
`638`	`638`	`const du_cell_index_t cell_index = cell_res_grid.cell_index();`