sched: remove unused fnc from pucch res manager

carlo-gal · codebot · commit 54f61c98c830 · 2024-07-03T11:41:51.000Z
Signed-off-by: Carlo Galiotto &lt;carlo@srs.io&gt;
diff --git a/lib/scheduler/pucch_scheduling/pucch_resource_manager.cpp b/lib/scheduler/pucch_scheduling/pucch_resource_manager.cpp
@@ -136,7 +136,8 @@ const pucch_resource* pucch_resource_manager::reserve_csi_resource(slot_point
 
   // Get resource list of wanted slot.
   auto& slot_record = get_slot_resource_counter(slot_csi);
-  if (slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti != rnti_t::INVALID_RNTI) {
+  if (slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti != rnti_t::INVALID_RNTI and
+      slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti != crnti) {
     return nullptr;
   }
 
@@ -148,14 +149,16 @@ const pucch_resource* pucch_resource_manager::reserve_csi_resource(slot_point
         return res.res_id.cell_res_id == csi_pucch_res_idx;
       });
 
-  // If the PUCCH res with correct ID is found, then allocate it to the user.
-  if (res_cfg != pucch_res_list.end()) {
+  if (res_cfg == pucch_res_list.end()) {
+    return nullptr;
+  }
+
+  // If the PUCCH res with correct ID was not allocated to the UE's RNTI, allocate it to this RNTI.
+  if (slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti != crnti) {
     slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti           = crnti;
     slot_record.ues_using_pucch_res[csi_pucch_res_idx].resource_usage = pucch_resource_usage::CSI;
-    return &(*res_cfg);
   }
-
-  return nullptr;
+  return &(*res_cfg);
 };
 
 const pucch_resource*
@@ -169,7 +172,8 @@ pucch_resource_manager::reserve_sr_res_available(slot_point slot_sr, rnti_t crnt
 
   // We assume each UE only has 1 SR Resource Config configured.
   const unsigned sr_pucch_res_id = pucch_cfg.sr_res_list[0].pucch_res_id.cell_res_id;
-  if (slot_record.ues_using_pucch_res[sr_pucch_res_id].rnti != rnti_t::INVALID_RNTI) {
+  if (slot_record.ues_using_pucch_res[sr_pucch_res_id].rnti != rnti_t::INVALID_RNTI and
+      slot_record.ues_using_pucch_res[sr_pucch_res_id].rnti != crnti) {
     return nullptr;
   }
 
@@ -180,14 +184,16 @@ pucch_resource_manager::reserve_sr_res_available(slot_point slot_sr, rnti_t crnt
         return res.res_id.cell_res_id == sr_pucch_res_id;
       });
 
-  // If the PUCCH res with correct ID is found, then allocate it to the user.
-  if (res_cfg != pucch_res_list.end()) {
+  if (res_cfg == pucch_res_list.end()) {
+    return nullptr;
+  }
+
+  // If the PUCCH res with correct ID was not allocated to the UE's RNTI, allocate it to this RNTI.
+  if (slot_record.ues_using_pucch_res[sr_pucch_res_id].rnti != crnti and res_cfg != pucch_res_list.end()) {
     slot_record.ues_using_pucch_res[sr_pucch_res_id].rnti           = crnti;
     slot_record.ues_using_pucch_res[sr_pucch_res_id].resource_usage = pucch_resource_usage::SR;
-    return &(*res_cfg);
   }
-
-  return nullptr;
+  return &(*res_cfg);
 };
 
 bool pucch_resource_manager::release_harq_f1_resource(slot_point slot_harq, rnti_t crnti, const pucch_config& pucch_cfg)
@@ -243,100 +249,6 @@ bool pucch_resource_manager::release_csi_resource(slot_point                   s
   return true;
 }
 
-int pucch_resource_manager::fetch_f1_pucch_res_indic(slot_point slot_tx, rnti_t crnti, const pucch_config& pucch_cfg)
-{
-  return fetch_pucch_res_indic(slot_tx, crnti, pucch_cfg, pucch_format::FORMAT_1);
-}
-
-int pucch_resource_manager::fetch_f2_pucch_res_indic(slot_point slot_tx, rnti_t crnti, const pucch_config& pucch_cfg)
-{
-  return fetch_pucch_res_indic(slot_tx, crnti, pucch_cfg, pucch_format::FORMAT_2);
-}
-
-const pucch_harq_resource_alloc_record
-pucch_resource_manager::fetch_allocated_f2_harq_resource(slot_point          slot_harq,
-                                                         rnti_t              crnti,
-                                                         const pucch_config& pucch_cfg)
-{
-  srsran_sanity_check(slot_harq < last_sl_ind + RES_MANAGER_RING_BUFFER_SIZE,
-                      "PUCCH being allocated too far into the future");
-
-  // Get resource list of wanted slot.
-  rnti_pucch_res_id_slot_record& res_counter = get_slot_resource_counter(slot_harq);
-
-  auto& slot_res_array = res_counter.ues_using_pucch_res;
-
-  // Get the span over the array of resources for the specific UE.
-  const auto& ue_res_id_set_for_harq = pucch_cfg.pucch_res_set[PUCCH_HARQ_F2_RES_SET_ID].pucch_res_id_list;
-  unsigned    ue_first_res_id        = ue_res_id_set_for_harq.front().cell_res_id;
-  srsran_assert(ue_first_res_id + ue_res_id_set_for_harq.size() <= slot_res_array.size(),
-                "Indexing of PUCCH resource set exceeds the size of the cell resource array");
-  span<resource_tracker> slot_ue_res_array(&slot_res_array[ue_first_res_id], ue_res_id_set_for_harq.size());
-
-  // Check first if the target PUCCH resource (given the CRNTI and usage) exists within the resource tracker.
-  auto* target_ue_resource = std::find_if(
-      slot_ue_res_array.begin(), slot_ue_res_array.end(), [target_rnti = crnti](const resource_tracker& res) {
-        return res.rnti == target_rnti and res.resource_usage == pucch_resource_usage::HARQ_F2;
-      });
-
-  const auto& pucch_res_list = pucch_cfg.pucch_res_list;
-
-  // If the resource is found, get the resource indicator and the configuration from the PUCCH resource list.
-  if (target_ue_resource != slot_ue_res_array.end() and
-      static_cast<unsigned>(target_ue_resource - slot_ue_res_array.begin()) <
-          pucch_cfg.pucch_res_set[PUCCH_HARQ_F2_RES_SET_ID].pucch_res_id_list.size()) {
-    // Get the PUCCH resource indicator from the available resource position within the span.
-    const unsigned pucch_res_indicator = static_cast<unsigned>(target_ue_resource - slot_ue_res_array.begin());
-    // Get the PUCCH resource ID from the PUCCH resource indicator and the PUCCH resource set.
-    const unsigned pucch_res_idx_from_list = ue_res_id_set_for_harq[pucch_res_indicator].cell_res_id;
-
-    // Search for the PUCCH resource with the correct PUCCH resource ID from the PUCCH resource list.
-    const auto* res_cfg = std::find_if(
-        pucch_res_list.begin(), pucch_res_list.end(), [pucch_res_idx_from_list](const pucch_resource& res) {
-          return res.res_id.cell_res_id == pucch_res_idx_from_list;
-        });
-
-    return pucch_harq_resource_alloc_record{.pucch_res = &(*res_cfg), .pucch_res_indicator = pucch_res_indicator};
-  }
-  return pucch_harq_resource_alloc_record{.pucch_res = nullptr};
-}
-
-const pucch_resource* pucch_resource_manager::fetch_csi_pucch_res_config(slot_point                   slot_tx,
-                                                                         rnti_t                       crnti,
-                                                                         const ue_cell_configuration& ue_cell_cfg)
-{
-  srsran_sanity_check(slot_tx < last_sl_ind + RES_MANAGER_RING_BUFFER_SIZE,
-                      "PUCCH being allocated to far into the future");
-
-  rnti_pucch_res_id_slot_record& slot_record = get_slot_resource_counter(slot_tx);
-
-  const int csi_pucch_res_idx_int = get_pucch_res_idx_for_csi(ue_cell_cfg);
-  if (csi_pucch_res_idx_int < 0) {
-    return nullptr;
-  }
-
-  const unsigned csi_pucch_res_idx = static_cast<unsigned>(csi_pucch_res_idx_int);
-  if (slot_record.ues_using_pucch_res[csi_pucch_res_idx].rnti != crnti) {
-    return nullptr;
-  }
-
-  const auto& pucch_res_list =
-      ue_cell_cfg.cfg_dedicated().ul_config.value().init_ul_bwp.pucch_cfg.value().pucch_res_list;
-
-  // Search for the PUCCH resource with the correct PUCCH resource ID from the PUCCH resource list.
-  const auto* res_cfg =
-      std::find_if(pucch_res_list.begin(), pucch_res_list.end(), [csi_pucch_res_idx](const pucch_resource& res) {
-        return res.res_id.cell_res_id == csi_pucch_res_idx;
-      });
-
-  // If the PUCCH res with correct ID is found, then return it to the user.
-  if (res_cfg != pucch_res_list.end()) {
-    return &(*res_cfg);
-  }
-
-  return nullptr;
-}
-
 pucch_harq_resource_alloc_record pucch_resource_manager::reserve_next_harq_res_available(slot_point          slot_harq,
                                                                                          rnti_t              crnti,
                                                                                          const pucch_config& pucch_cfg,
@@ -424,23 +336,27 @@ const pucch_resource* pucch_resource_manager::reserve_harq_res_by_res_indicator(
   const auto& pucch_res_list    = pucch_cfg.pucch_res_list;
 
   // Check first if the wanted PUCCH resource is available.
-  if (pucch_res_tracker.rnti == rnti_t::INVALID_RNTI) {
-    // Search for the PUCCH resource with the correct PUCCH resource ID from the PUCCH resource list.
-    const auto* res_cfg =
-        std::find_if(pucch_res_list.begin(), pucch_res_list.end(), [pucch_res_id](const pucch_resource& res) {
-          return res.res_id.cell_res_id == pucch_res_id;
-        });
+  if (pucch_res_tracker.rnti != rnti_t::INVALID_RNTI and pucch_res_tracker.rnti != crnti) {
+    return nullptr;
+  }
 
-    // If the PUCCH res with correct ID is found, then allocate it to the user.
-    if (res_cfg != pucch_res_list.end()) {
-      pucch_res_tracker.rnti = crnti;
-      pucch_res_tracker.resource_usage =
-          format == pucch_format::FORMAT_1 ? pucch_resource_usage::HARQ_F1 : pucch_resource_usage::HARQ_F2;
-      return &(*res_cfg);
-    }
+  // Search for the PUCCH resource with the correct PUCCH resource ID from the PUCCH resource list.
+  const auto* res_cfg =
+      std::find_if(pucch_res_list.begin(), pucch_res_list.end(), [pucch_res_id](const pucch_resource& res) {
+        return res.res_id.cell_res_id == pucch_res_id;
+      });
+
+  if (res_cfg == pucch_res_list.end()) {
+    return nullptr;
   }
 
-  return nullptr;
+  // If the PUCCH res with correct ID is found and previously not used by given UE's RNTI, then allocate it this RNTI.
+  if (pucch_res_tracker.rnti == rnti_t::INVALID_RNTI) {
+    pucch_res_tracker.rnti = crnti;
+    pucch_res_tracker.resource_usage =
+        format == pucch_format::FORMAT_1 ? pucch_resource_usage::HARQ_F1 : pucch_resource_usage::HARQ_F2;
+  }
+  return &(*res_cfg);
 }
 
 bool pucch_resource_manager::release_harq_resource(slot_point          slot_harq,
@@ -485,49 +401,6 @@ bool pucch_resource_manager::release_harq_resource(slot_point          slot_harq
   return false;
 }
 
-int pucch_resource_manager::fetch_pucch_res_indic(slot_point          slot_tx,
-                                                  rnti_t              crnti,
-                                                  const pucch_config& pucch_cfg,
-                                                  pucch_format        format)
-{
-  srsran_sanity_check(slot_tx < last_sl_ind + RES_MANAGER_RING_BUFFER_SIZE,
-                      "PUCCH being allocated to far into the future");
-  srsran_assert(format == pucch_format::FORMAT_1 or format == pucch_format::FORMAT_2,
-                "Only PUCCH Format 1 and Format 2 are currently supported");
-
-  // Get resource list of wanted slot.
-  rnti_pucch_res_id_slot_record& res_counter = get_slot_resource_counter(slot_tx);
-
-  auto& slot_res_array = res_counter.ues_using_pucch_res;
-
-  const unsigned res_set_idx = format == pucch_format::FORMAT_1 ? PUCCH_HARQ_F1_RES_SET_ID : PUCCH_HARQ_F2_RES_SET_ID;
-  const pucch_resource_usage res_usage =
-      format == pucch_format::FORMAT_1 ? pucch_resource_usage::HARQ_F1 : pucch_resource_usage::HARQ_F2;
-
-  // Get the span over the array of resources for the specific UE.
-  const auto& ue_res_id_set_for_harq = pucch_cfg.pucch_res_set[res_set_idx].pucch_res_id_list;
-  unsigned    ue_first_res_id        = ue_res_id_set_for_harq.front().cell_res_id;
-  srsran_assert(ue_first_res_id + ue_res_id_set_for_harq.size() <= slot_res_array.size(),
-                "Indexing of PUCCH resource set exceeds the size of the cell resource array");
-  span<resource_tracker> slot_ue_res_array(&slot_res_array[ue_first_res_id], ue_res_id_set_for_harq.size());
-
-  // Check first if the target PUCCH resource (given the CRNTI and usage) exists within the resource tracker.
-  auto* ue_resource = std::find_if(slot_ue_res_array.begin(),
-                                   slot_ue_res_array.end(),
-                                   [target_rnti = crnti, res_usage](const resource_tracker& res) {
-                                     return res.rnti == target_rnti and res.resource_usage == res_usage;
-                                   });
-
-  if (ue_resource != slot_ue_res_array.end() and static_cast<unsigned>(ue_resource - slot_ue_res_array.begin()) <
-                                                     pucch_cfg.pucch_res_set[res_set_idx].pucch_res_id_list.size()) {
-    // Get the PUCCH resource indicator from the available resource position within the span.
-    return static_cast<unsigned>(ue_resource - slot_ue_res_array.begin());
-  }
-
-  // -1 indicates that the there is no UE record for given RNTI.
-  return -1;
-}
-
 pucch_resource_manager::rnti_pucch_res_id_slot_record& pucch_resource_manager::get_slot_resource_counter(slot_point sl)
 {
   srsran_sanity_check(sl < last_sl_ind + RES_MANAGER_RING_BUFFER_SIZE,
diff --git a/lib/scheduler/pucch_scheduling/pucch_resource_manager.h b/lib/scheduler/pucch_scheduling/pucch_resource_manager.h
@@ -124,27 +124,6 @@ class pucch_resource_manager
   /// \return True if the resource for the UE was found in the allocation records for the given slot.
   bool release_csi_resource(slot_point slot_sr, rnti_t crnti, const ue_cell_configuration& ue_cell_cfg);
 
-  /// \brief Returns the PUCCH resource indicator (format 1) of the resource used for a given RNTI at a given slot.
-  /// \return PUCCH resource indicator of the resource used allocated to the UE; if UE is not found, returns -1.
-  int fetch_f1_pucch_res_indic(slot_point slot_tx, rnti_t crnti, const pucch_config& pucch_cfg);
-
-  /// \brief Returns the PUCCH resource indicator (format 2) of the resource used for a given RNTI at a given slot.
-  /// \return PUCCH resource indicator of the resource used allocated to the UE; if UE is not found, returns -1.
-  int fetch_f2_pucch_res_indic(slot_point slot_tx, rnti_t crnti, const pucch_config& pucch_cfg);
-
-  /// \brief Fetches the configuration of the PUCCH Format 2 resource used for HARQ previously allocated to a given RNTI
-  /// for a given slot.
-  /// \return If the resource is found, it returns (i) the pointer to the configuration and (ii) the PUCCH resource
-  /// indicator corresponding to the PUCCH resource that previously allocated to the UE. Else, the pointer passed will
-  /// be \c nullptr, whereas the PUCCH resource indicator is to be ignored.
-  const pucch_harq_resource_alloc_record
-  fetch_allocated_f2_harq_resource(slot_point slot_harq, rnti_t crnti, const pucch_config& pucch_cfg);
-
-  /// \brief Returns the configuration of the PUCCH resource used for CSI (format 2) for a given RNTI at a given slot.
-  /// \return Pointer to the resource configuration used allocated to the UE; if UE is not found, returns \c nullptr.
-  const pucch_resource*
-  fetch_csi_pucch_res_config(slot_point slot_tx, rnti_t crnti, const ue_cell_configuration& ue_cell_cfg);
-
 private:
   /// Size of the ring buffer of pucch_resource_manager. This size sets a limit on how far in advance a PUCCH can be
   /// allocated.
@@ -194,8 +173,6 @@ class pucch_resource_manager
 
   bool release_harq_resource(slot_point slot_harq, rnti_t crnti, const pucch_config& pucch_cfg, pucch_format format);
 
-  int fetch_pucch_res_indic(slot_point slot_tx, rnti_t crnti, const pucch_config& pucch_cfg, pucch_format format);
-
   // Ring buffer of rnti_pucch_res_id_slot_record for PUCCH resources.
   std::array<rnti_pucch_res_id_slot_record, RES_MANAGER_RING_BUFFER_SIZE> resource_slots;
 
diff --git a/tests/unittests/scheduler/uci_and_pucch/pucch_res_manager_test.cpp b/tests/unittests/scheduler/uci_and_pucch/pucch_res_manager_test.cpp
