sched: test retx cancellation

Author: frankist

lib/scheduler/ue_scheduling/cell_harq_manager.cpp

@@ -176,12 +176,12 @@ void cell_harq_repository<IsDl>::handle_ack(harq_type& h, bool ack)
 {
   if (not ack and h.nof_retxs >= h.max_nof_harq_retxs) {
     if (h.retxs_cancelled) {
-      logger.info("rnti={} h_id={}: Discarding {} HARQ process TB with tbs={}. Cause: Retxs for this HARQ process were "
-                  "cancelled",
-                  h.rnti,
-                  h.h_id,
-                  IsDl ? "DL" : "UL",
-                  h.prev_tx_params.tbs_bytes);
+      logger.debug("rnti={} h_id={}: Discarding {} HARQ process TB with tbs={}. Cause: Retxs for this HARQ process "
+                   "were cancelled",
+                   h.rnti,
+                   h.h_id,
+                   IsDl ? "DL" : "UL",
+                   h.prev_tx_params.tbs_bytes);
     } else {
       logger.info(
           "rnti={} h_id={}: Discarding {} HARQ process TB with tbs={}. Cause: Maximum number of reTxs {} exceeded",
@@ -465,6 +465,11 @@ void dl_harq_process_view::increment_pucch_counter()
   ++fetch_impl().pucch_ack_to_receive;
 }
 
+void dl_harq_process_view::cancel_retxs()
+{
+  cell_harq_mng->dl.cancel_retxs(fetch_impl());
+}
+
 void dl_harq_process_view::save_grant_params(const dl_harq_sched_context& ctx, const pdsch_information& pdsch)
 {
   srsran_assert(pdsch.codewords.size() == 1, "Only one codeword supported");
@@ -509,6 +514,11 @@ int ul_harq_process_view::ul_crc_info(bool ack)
   return cell_harq_mng->ul_crc_info(cell_harq_mng->ul.harqs[harq_ref_idx], ack);
 }
 
+void ul_harq_process_view::cancel_retxs()
+{
+  cell_harq_mng->ul.cancel_retxs(fetch_impl());
+}
+
 void ul_harq_process_view::save_grant_params(const ul_harq_sched_context& ctx, const pusch_information& pusch)
 {
   ul_harq_process_impl& impl = fetch_impl();

lib/scheduler/ue_scheduling/cell_harq_manager.h

@@ -291,6 +291,8 @@ class dl_harq_process_view
 
   void increment_pucch_counter();
 
+  void cancel_retxs();
+
   /// \brief Stores grant parameters that are associated with the HARQ process (e.g. DCI format, PRBs, MCS) so that
   /// they can be later fetched and optionally reused.
   void save_grant_params(const dl_harq_sched_context& ctx, const pdsch_information& pdsch);
@@ -330,13 +332,19 @@ class ul_harq_process_view
 
   bool is_waiting_ack() const { return fetch_impl().status == harq_utils::harq_state_t::waiting_ack; }
   bool has_pending_retx() const { return fetch_impl().status == harq_utils::harq_state_t::pending_retx; }
+  bool empty() const
+  {
+    return harq_ref_idx == cell_harq_manager::INVALID_HARQ or fetch_impl().status == harq_utils::harq_state_t::empty;
+  }
 
   [[nodiscard]] bool new_retx(slot_point pusch_slot);
 
   /// Update UL HARQ state given the received CRC indication.
   /// \return Transport Block size of the HARQ whose state was updated.
   int ul_crc_info(bool ack);
 
+  void cancel_retxs();
+
   /// \brief Stores grant parameters that are associated with the HARQ process (e.g. DCI format, PRBs, MCS) so that
   /// they can be later fetched and optionally reused.
   void save_grant_params(const ul_harq_sched_context& ctx, const pusch_information& pdsch);

tests/unittests/scheduler/ue_scheduling/harq_manager_test.cpp

@@ -413,6 +413,20 @@ TEST_F(single_harq_process_test, when_ack_wait_timeout_reached_then_harq_is_avai
   }
 }
 
+TEST_F(single_harq_process_test, when_harq_retx_is_cancelled_then_harq_nack_empties_it)
+{
+  h_dl.cancel_retxs();
+  h_ul.cancel_retxs();
+  ASSERT_TRUE(h_dl.is_waiting_ack());
+  ASSERT_TRUE(h_ul.is_waiting_ack());
+
+  ASSERT_EQ(h_dl.dl_ack_info(mac_harq_ack_report_status::nack, std::nullopt),
+            dl_harq_process_view::status_update::nacked);
+  ASSERT_EQ(h_ul.ul_crc_info(false), 0);
+  ASSERT_TRUE(h_dl.empty());
+  ASSERT_TRUE(h_ul.empty());
+}
+
 // DL HARQ process with multi PUCCH test
 
 TEST_F(dl_harq_process_multi_pucch_test, when_dtx_received_after_ack_then_dtx_is_ignored)