sched: move cell harq manager to scheduler/cell folder

Author: frankist

lib/scheduler/cell/CMakeLists.txt

@@ -10,4 +10,5 @@ add_library(sched_cell OBJECT
         vrb_alloc.cpp
         resource_block_group.cpp
         resource_grid.cpp
-        scheduler_prb.cpp)
+        scheduler_prb.cpp
+        cell_harq_manager.cpp)

lib/scheduler/ue_scheduling/cell_harq_manager.cpp renamed to lib/scheduler/cell/cell_harq_manager.cpp

@@ -9,7 +9,7 @@
  */
 
 #include "cell_harq_manager.h"
-#include "../cell/resource_grid_util.h"
+#include "resource_grid_util.h"
 #include "srsran/scheduler/scheduler_slot_handler.h"
 
 using namespace srsran;
@@ -30,21 +30,25 @@ class noop_harq_timeout_notifier : public harq_timeout_notifier
 template <bool IsDl>
 cell_harq_repository<IsDl>::cell_harq_repository(unsigned               max_ues,
                                                  unsigned               max_ack_wait_timeout,
+                                                 unsigned               max_harqs_per_ue_,
                                                  harq_timeout_notifier& timeout_notifier_,
                                                  srslog::basic_logger&  logger_) :
-  max_ack_wait_in_slots(max_ack_wait_timeout), timeout_notifier(timeout_notifier_), logger(logger_)
+  max_ack_wait_in_slots(max_ack_wait_timeout),
+  max_harqs_per_ue(max_harqs_per_ue_),
+  timeout_notifier(timeout_notifier_),
+  logger(logger_)
 {
-  harqs.resize(MAX_NOF_HARQS * max_ues);
-  free_harqs.resize(MAX_NOF_HARQS * max_ues);
+  harqs.resize(max_harqs_per_ue * max_ues);
+  free_harqs.resize(max_harqs_per_ue * max_ues);
   for (unsigned i = 0; i != free_harqs.size(); ++i) {
     free_harqs[i] = free_harqs.size() - i - 1;
   }
 
   // Reserve space in advance for UEs.
   ues.resize(max_ues);
   for (unsigned i = 0; i != max_ues; i++) {
-    ues[i].free_harq_ids.reserve(MAX_NOF_HARQS);
-    ues[i].harqs.reserve(MAX_NOF_HARQS);
+    ues[i].free_harq_ids.reserve(max_harqs_per_ue);
+    ues[i].harqs.reserve(max_harqs_per_ue);
   }
 
   harq_timeout_wheel.resize(get_allocator_ring_size_gt_min(max_ack_wait_timeout + get_max_slot_ul_alloc_delay(0)));
@@ -337,18 +341,19 @@ template class harq_utils::base_harq_process_handle<false>;
 // Cell HARQ manager.
 
 cell_harq_manager::cell_harq_manager(unsigned                               max_ues,
+                                     unsigned                               max_harqs_per_ue_,
                                      std::unique_ptr<harq_timeout_notifier> notifier,
                                      unsigned                               max_ack_wait_timeout) :
+  max_harqs_per_ue(max_harqs_per_ue_),
   timeout_notifier(notifier != nullptr ? std::move(notifier) : std::make_unique<noop_harq_timeout_notifier>()),
   logger(srslog::fetch_basic_logger("SCHED")),
-  dl(max_ues, max_ack_wait_timeout, *timeout_notifier, logger),
-  ul(max_ues, max_ack_wait_timeout, *timeout_notifier, logger)
+  dl(max_ues, max_ack_wait_timeout, max_harqs_per_ue, *timeout_notifier, logger),
+  ul(max_ues, max_ack_wait_timeout, max_harqs_per_ue, *timeout_notifier, logger)
 {
 }
 
 void cell_harq_manager::slot_indication(slot_point sl_tx)
 {
-  last_sl_tx = sl_tx;
   dl.slot_indication(sl_tx);
   ul.slot_indication(sl_tx);
 }
@@ -371,9 +376,9 @@ ul_harq_pending_retx_list cell_harq_manager::pending_ul_retxs()
 unique_ue_harq_entity
 cell_harq_manager::add_ue(du_ue_index_t ue_idx, rnti_t crnti, unsigned nof_dl_harq_procs, unsigned nof_ul_harq_procs)
 {
-  srsran_sanity_check(nof_dl_harq_procs > 0, "Invalid number of HARQs");
-  srsran_sanity_check(nof_ul_harq_procs > 0, "Invalid number of HARQs");
-  srsran_sanity_check(ue_idx < dl.ues.size(), "Invalid ue_index");
+  srsran_assert(nof_dl_harq_procs <= max_harqs_per_ue and nof_dl_harq_procs > 0, "Invalid number of DL HARQs");
+  srsran_assert(nof_ul_harq_procs <= max_harqs_per_ue and nof_ul_harq_procs > 0, "Invalid number of DL HARQs");
+  srsran_assert(ue_idx < dl.ues.size(), "Invalid ue_index");
   srsran_assert(not contains(ue_idx), "Creating UE with duplicate ue_index");
   dl.reserve_ue_harqs(ue_idx, nof_dl_harq_procs);
   ul.reserve_ue_harqs(ue_idx, nof_ul_harq_procs);

lib/scheduler/ue_scheduling/cell_harq_manager.h renamed to lib/scheduler/cell/cell_harq_manager.h

@@ -21,7 +21,6 @@
 #include "srsran/scheduler/harq_id.h"
 #include "srsran/scheduler/scheduler_dci.h"
 #include "srsran/srslog/srslog.h"
-#include <queue>
 
 namespace srsran {
 
@@ -133,11 +132,13 @@ struct cell_harq_repository {
 
   cell_harq_repository(unsigned               max_ues,
                        unsigned               max_ack_wait_in_slots,
+                       unsigned               max_harqs_per_ue,
                        harq_timeout_notifier& timeout_notifier_,
                        srslog::basic_logger&  logger_);
 
   /// Maximum value of time interval, in slots, before the HARQ process assumes that the ACK/CRC went missing.
   const unsigned         max_ack_wait_in_slots;
+  const unsigned         max_harqs_per_ue;
   harq_timeout_notifier& timeout_notifier;
   srslog::basic_logger&  logger;
 
@@ -392,6 +393,7 @@ class cell_harq_manager
   constexpr static unsigned DEFAULT_ACK_TIMEOUT_SLOTS = 256U;
 
   cell_harq_manager(unsigned                               max_ues              = MAX_NOF_DU_UES,
+                    unsigned                               max_harqs_per_ue     = MAX_NOF_HARQS,
                     std::unique_ptr<harq_timeout_notifier> notifier             = nullptr,
                     unsigned                               max_ack_wait_timeout = DEFAULT_ACK_TIMEOUT_SLOTS);
 
@@ -434,11 +436,10 @@ class cell_harq_manager
   harq_utils::ul_harq_process_impl*
   new_ul_tx(du_ue_index_t ue_idx, rnti_t rnti, slot_point pusch_slot, unsigned max_harq_nof_retxs);
 
+  const unsigned                         max_harqs_per_ue;
   std::unique_ptr<harq_timeout_notifier> timeout_notifier;
   srslog::basic_logger&                  logger;
 
-  slot_point last_sl_tx;
-
   harq_utils::cell_harq_repository<true>  dl;
   harq_utils::cell_harq_repository<false> ul;
 };

lib/scheduler/ue_scheduling/CMakeLists.txt

@@ -8,7 +8,6 @@
 
 set(SOURCES
         harq_process.cpp
-        cell_harq_manager.cpp
         dl_logical_channel_manager.cpp
         ul_logical_channel_manager.cpp
         ta_manager.cpp

tests/unittests/scheduler/CMakeLists.txt

@@ -12,7 +12,7 @@ include_directories(../../..)
 
 add_subdirectory(test_utils)
 add_subdirectory(support)
-add_subdirectory(cell_resource_grid)
+add_subdirectory(cell)
 add_subdirectory(common_scheduling)
 add_subdirectory(ue_scheduling)
 add_subdirectory(uci_and_pucch)

tests/unittests/scheduler/cell_resource_grid/CMakeLists.txt renamed to tests/unittests/scheduler/cell/CMakeLists.txt

@@ -6,13 +6,16 @@
 # the distribution.
 #
 
-add_executable(cell_resource_grid_test sched_prb_test.cpp cell_resource_grid_test.cpp)
-target_link_libraries(cell_resource_grid_test
+add_executable(scheduler_cell_resource_test
+        sched_prb_test.cpp
+        cell_resource_grid_test.cpp
+        cell_harq_manager_test.cpp)
+target_link_libraries(scheduler_cell_resource_test
         srsran_sched
         srslog
         mac_configuration_helpers
         sched_config
         gtest
         gtest_main)
-gtest_discover_tests(cell_resource_grid_test)
+gtest_discover_tests(scheduler_cell_resource_test)
 

tests/unittests/scheduler/ue_scheduling/harq_manager_test.cpp renamed to tests/unittests/scheduler/cell/cell_harq_manager_test.cpp

@@ -8,7 +8,7 @@
  *
  */
 
-#include "lib/scheduler/ue_scheduling/cell_harq_manager.h"
+#include "lib/scheduler/cell/cell_harq_manager.h"
 #include "srsran/scheduler/scheduler_slot_handler.h"
 #include "srsran/support/test_utils.h"
 #include <gtest/gtest.h>
@@ -92,7 +92,8 @@ class dummy_harq_timeout_handler
 class base_harq_manager_test
 {
 protected:
-  base_harq_manager_test(unsigned nof_ues) : cell_harqs(nof_ues, timeout_handler.make_notifier(), max_ack_wait_timeout)
+  base_harq_manager_test(unsigned nof_ues) :
+    cell_harqs(nof_ues, max_harqs_per_ue, timeout_handler.make_notifier(), max_ack_wait_timeout)
   {
     logger.set_level(srslog::basic_levels::warning);
     srslog::init();
@@ -109,6 +110,7 @@ class base_harq_manager_test
   }
 
   const unsigned             max_ack_wait_timeout = 16;
+  const unsigned             max_harqs_per_ue     = 16;
   dummy_harq_timeout_handler timeout_handler;
   srslog::basic_logger&      logger = srslog::fetch_basic_logger("SCHED");
 

tests/unittests/scheduler/cell_resource_grid/cell_resource_grid_test.cpp renamed to tests/unittests/scheduler/cell/cell_resource_grid_test.cpp

@@ -8,7 +8,6 @@
 
 add_executable(ue_scheduler_test
         logical_channel_test.cpp
-        harq_manager_test.cpp
         fallback_scheduler_test.cpp
         ue_cell_test.cpp
         ue_configuration_test.cpp