mac: remove RNTI manager duplicate from MAC

Author: frankist

lib/mac/mac_sched/srsran_scheduler_adapter.cpp

@@ -265,7 +265,7 @@ void srsran_scheduler_adapter::cell_handler::handle_rach_indication(const mac_ra
     sched_occasion.start_symbol    = occasion.start_symbol;
     sched_occasion.frequency_index = occasion.frequency_index;
     for (const auto& preamble : occasion.preambles) {
-      rnti_t alloc_tc_rnti = parent->rnti_alloc.allocate();
+      rnti_t alloc_tc_rnti = parent->rnti_mng.allocate();
       if (alloc_tc_rnti == rnti_t::INVALID_RNTI) {
         parent->logger.warning(
             "cell={} preamble id={}: Ignoring PRACH. Cause: Failed to allocate TC-RNTI.", cell_idx, preamble.index);

lib/mac/mac_sched/srsran_scheduler_adapter.h

@@ -109,7 +109,9 @@ class srsran_scheduler_adapter final : public mac_scheduler_adapter
     srsran_scheduler_adapter& parent;
   };
 
+  // Allocator for TC-RNTIs.
   rnti_manager& rnti_mng;
+
   /// Detector of UE RLFs.
   rlf_detector          rlf_handler;
   task_executor&        ctrl_exec;
@@ -121,9 +123,6 @@ class srsran_scheduler_adapter final : public mac_scheduler_adapter
   /// srsGNB scheduler.
   std::unique_ptr<mac_scheduler> sched_impl;
 
-  /// Allocator of TC-RNTI values.
-  rnti_manager rnti_alloc;
-
   /// List of event flags used by scheduler to notify that the configuration is complete.
   struct ue_notification_context {
     manual_event<bool> ue_config_ready;

tests/unittests/mac/CMakeLists.txt

@@ -21,6 +21,7 @@ add_executable(mac_test
         mac_cell_processor_test.cpp
         dl_sch_pdu_assembler_test.cpp
         mac_rar_pdu_assembler_test.cpp
+        rnti_manager_test.cpp
         mac_dl_cfg_test.cpp)
 target_link_libraries(mac_test
         srsran_pcap

tests/unittests/mac/rnti_manager_test.cpp

@@ -0,0 +1,42 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#include "lib/mac/rnti_manager.h"
+#include <gtest/gtest.h>
+
+using namespace srsran;
+
+TEST(rnti_manager_test, when_allocate_rnti_called_multiple_times_then_rntis_are_unique)
+{
+  rnti_manager rnti_db;
+
+  unsigned         max_count = 100;
+  std::set<rnti_t> prev_rntis;
+  for (unsigned count = 0; count != max_count; ++count) {
+    rnti_t rnti = rnti_db.allocate();
+    ASSERT_EQ(prev_rntis.count(rnti), 0);
+    prev_rntis.insert(rnti);
+  }
+
+  ASSERT_EQ(rnti_db.nof_ues(), 0) << "No UE should have been added";
+}
+
+TEST(rnti_manager_test, when_ue_added_then_allocate_rnti_does_not_repeat_rnti)
+{
+  rnti_manager rnti_db;
+
+  rnti_t rnti1 = rnti_db.allocate();
+  ASSERT_TRUE(rnti_db.add_ue(rnti1, to_du_ue_index(0)));
+
+  rnti_t rnti2 = rnti_db.allocate();
+  ASSERT_NE(rnti1, rnti2);
+
+  ASSERT_EQ(rnti_db.nof_ues(), 1);
+}