fapi_adaptor: add a stop method to the MAC-FAPI adaptor. This stop method will filter the downlink data to the adaptor.

Author: AlaiaL

include/srsran/fapi_adaptor/mac/mac_fapi_adaptor.h

@@ -23,6 +23,9 @@ class mac_fapi_adaptor
 
   /// Returns the MAC–FAPI sector adaptor for the given cell id.
   virtual mac_fapi_sector_adaptor& get_sector_adaptor(unsigned cell_id) = 0;
+
+  /// Stops the MAC–FAPI adaptor.
+  virtual void stop() = 0;
 };
 
 } // namespace fapi_adaptor

include/srsran/fapi_adaptor/mac/mac_fapi_sector_adaptor.h

@@ -37,6 +37,9 @@ class mac_fapi_sector_adaptor
 public:
   virtual ~mac_fapi_sector_adaptor() = default;
 
+  /// Stops the MAC–FAPI sector adaptor.
+  virtual void stop() = 0;
+
   /// \brief Returns a reference to the slot time notifier used by the adaptor.
   virtual fapi::slot_time_message_notifier& get_slot_time_message_notifier() = 0;
 

lib/du/o_du_impl.cpp

@@ -13,6 +13,8 @@
 #include "srsran/du/du_low/o_du_low_metrics_collector.h"
 #include "srsran/du/o_du_metrics.h"
 #include "srsran/du/o_du_metrics_notifier.h"
+#include "srsran/fapi_adaptor/mac/mac_fapi_adaptor.h"
+#include "srsran/srslog/srslog.h"
 
 using namespace srsran;
 using namespace srs_du;
@@ -66,6 +68,9 @@ void o_du_impl::start()
 
 void o_du_impl::stop()
 {
+  // Stop the MAC-FAPI adaptor first.
+  odu_hi->get_mac_fapi_adaptor().stop();
+
   odu_lo->get_operation_controller().stop();
   odu_hi->get_operation_controller().stop();
 }

lib/fapi_adaptor/mac/mac_fapi_adaptor_factory_impl.cpp

@@ -37,6 +37,9 @@ class mac_fapi_adaptor_wrapper : public mac_fapi_sector_adaptor
     }
   }
 
+  // See interface for documentation.
+  void stop() override { adaptor->stop(); }
+
   // See interface for documentation.
   fapi::slot_time_message_notifier& get_slot_time_message_notifier() override
   {

lib/fapi_adaptor/mac/mac_fapi_adaptor_impl.cpp

@@ -26,6 +26,12 @@ mac_fapi_sector_adaptor& mac_fapi_adaptor_impl::get_sector_adaptor(unsigned cell
                 "Invalid cell identifier '{}'. Valid cell id range '[0-{})'",
                 cell_id,
                 sector_adaptors.size());
-
   return *sector_adaptors[cell_id];
 }
+
+void mac_fapi_adaptor_impl::stop()
+{
+  for (auto& sector : sector_adaptors) {
+    sector->stop();
+  }
+}

lib/fapi_adaptor/mac/mac_fapi_adaptor_impl.h

@@ -27,6 +27,9 @@ class mac_fapi_adaptor_impl : public mac_fapi_adaptor
   // See interface for documentation.
   mac_fapi_sector_adaptor& get_sector_adaptor(unsigned cell_id) override;
 
+  // See interface for documentation.
+  void stop() override;
+
 private:
   std::vector<std::unique_ptr<mac_fapi_sector_adaptor>> sector_adaptors;
 };

lib/fapi_adaptor/mac/mac_fapi_sector_adaptor_impl.h

@@ -28,6 +28,9 @@ class mac_fapi_sector_adaptor_impl : public mac_fapi_sector_adaptor
   mac_fapi_sector_adaptor_impl(const mac_fapi_sector_adaptor_config&  config,
                                mac_fapi_sector_adaptor_dependencies&& dependencies);
 
+  // See interface for documentation.
+  void stop() override { mac_translator.stop(); }
+
   // See interface for documentation.
   fapi::slot_time_message_notifier& get_slot_time_message_notifier() override;
 

lib/fapi_adaptor/mac/mac_to_fapi_translator.cpp

@@ -83,6 +83,11 @@ mac_to_fapi_translator::mac_to_fapi_translator(const mac_to_fapi_translator_conf
   srsran_assert(part2_mapper, "Invalid Part2 mapper");
 }
 
+void mac_to_fapi_translator::stop()
+{
+  stop_manager.stop();
+}
+
 template <typename builder_type, typename pdu_type>
 static void add_pdcch_pdus_to_builder(builder_type&                  builder,
                                       span<const pdu_type>           pdcch_info,
@@ -194,6 +199,13 @@ static void clear_dl_tti_pdus(fapi::dl_tti_request_message& msg)
 
 void mac_to_fapi_translator::on_new_downlink_scheduler_results(const mac_dl_sched_result& dl_res)
 {
+  stop_event_token token = stop_manager.get_token();
+  // Do not process results when the translator is not running.
+  if (SRSRAN_UNLIKELY(token.is_stop_requested())) {
+    return;
+  }
+
+  stop_token = std::move(token);
   fapi::dl_tti_request_message         msg;
   fapi::dl_tti_request_message_builder builder(msg);
 
@@ -248,6 +260,14 @@ void mac_to_fapi_translator::on_new_downlink_scheduler_results(const mac_dl_sche
 
 void mac_to_fapi_translator::on_new_downlink_data(const mac_dl_data_result& dl_data)
 {
+  stop_event_token token = stop_manager.get_token();
+  // Do not process results when the translator is not running.
+  if (SRSRAN_UNLIKELY(token.is_stop_requested())) {
+    return;
+  }
+
+  stop_token = std::move(token);
+
   srsran_assert(!dl_data.si_pdus.empty() || !dl_data.rar_pdus.empty() || !dl_data.ue_pdus.empty() ||
                     !dl_data.paging_pdus.empty(),
                 "Received a mac_dl_data_result object with zero payloads");
@@ -322,6 +342,14 @@ static void clear_ul_tti_pdus(fapi::ul_tti_request_message& msg)
 
 void mac_to_fapi_translator::on_new_uplink_scheduler_results(const mac_ul_sched_result& ul_res)
 {
+  stop_event_token token = stop_manager.get_token();
+  // Do not process results when the translator is not running.
+  if (SRSRAN_UNLIKELY(token.is_stop_requested())) {
+    return;
+  }
+
+  stop_token = std::move(token);
+
   fapi::ul_tti_request_message         msg;
   fapi::ul_tti_request_message_builder builder(msg);
 
@@ -407,4 +435,7 @@ void mac_to_fapi_translator::handle_ul_dci_request(span<const pdcch_ul_informati
 void mac_to_fapi_translator::on_cell_results_completion(slot_point slot)
 {
   last_msg_notifier.on_last_message(slot);
+
+  // Reset the stop token.
+  stop_token.reset();
 }

lib/fapi_adaptor/mac/mac_to_fapi_translator.h

@@ -15,6 +15,7 @@
 #include "srsran/mac/mac_cell_result.h"
 #include "srsran/mac/mac_cell_slot_handler.h"
 #include "srsran/scheduler/result/pdcch_info.h"
+#include "srsran/support/synchronization/stop_event.h"
 
 namespace srsran {
 
@@ -57,6 +58,9 @@ class mac_to_fapi_translator : public mac_cell_result_notifier
   mac_to_fapi_translator(const mac_to_fapi_translator_config&  config,
                          mac_to_fapi_translator_dependencies&& dependencies);
 
+  /// Stops the MAC to FAPI translator.
+  void stop();
+
   // See interface for documentation.
   void on_new_downlink_scheduler_results(const mac_dl_sched_result& dl_res) override;
 
@@ -94,6 +98,11 @@ class mac_to_fapi_translator : public mac_cell_result_notifier
   std::unique_ptr<uci_part2_correspondence_mapper> part2_mapper;
   /// MAC cell slot handler.
   mac_cell_slot_handler* mac_slot_handler;
+  /// Stop manager.
+  stop_event_source stop_manager;
+  /// Stop token. This token is used to track the when a slot is being used. It is set on new scheduler results
+  /// (downlink, uplink or downlink data) and reset on results completion.
+  stop_event_token stop_token;
 };
 
 } // namespace fapi_adaptor