phy: ammend executor mapping

Author: xavierarteaga

apps/services/worker_manager/worker_manager.cpp

@@ -454,9 +454,10 @@ void worker_manager::create_du_low_executors(const worker_manager_config::du_low
 
     // Fill the task executors for each cell.
     du_low_exec_mapper_config.executors = srs_du::du_low_executor_mapper_flexible_exec_config{
-        .high_priority_executor        = {rt_hi_prio_exec, nof_workers_general_pool},
-        .medium_priority_executor      = {non_rt_medium_prio_exec, nof_workers_general_pool},
-        .low_priority_executor         = {non_rt_low_prio_exec, nof_workers_general_pool},
+        .rt_hi_prio_exec               = {rt_hi_prio_exec, nof_workers_general_pool},
+        .non_rt_hi_prio_exec           = {non_rt_hi_prio_exec, nof_workers_general_pool},
+        .non_rt_medium_prio_exec       = {non_rt_medium_prio_exec, nof_workers_general_pool},
+        .non_rt_low_prio_exec          = {non_rt_low_prio_exec, nof_workers_general_pool},
         .max_pucch_concurrency         = du_low.max_pucch_concurrency,
         .max_pusch_and_srs_concurrency = du_low.max_pusch_and_srs_concurrency,
         .max_pdsch_concurrency         = du_low.max_pdsch_concurrency};

include/srsran/du/du_low/du_low_executor_mapper.h

@@ -51,12 +51,14 @@ struct du_low_executor_mapper_single_exec_config {
 /// concurrency given by each executor is used for creating pools of physical layer instances. These pools ensure that
 /// a number of instances are available for processing channels simultaneously.
 struct du_low_executor_mapper_flexible_exec_config {
-  /// High priority executor.
-  upper_phy_executor high_priority_executor;
-  /// Medium priority executor.
-  upper_phy_executor medium_priority_executor;
-  /// Low priority executor.
-  upper_phy_executor low_priority_executor;
+  /// Real-time high priority executor.
+  upper_phy_executor rt_hi_prio_exec;
+  /// Non-real-time high priority executor.
+  upper_phy_executor non_rt_hi_prio_exec;
+  /// Non-real-time medium priority executor.
+  upper_phy_executor non_rt_medium_prio_exec;
+  /// Non-real-time low priority executor.
+  upper_phy_executor non_rt_low_prio_exec;
   /// \brief Maximum PUCCH processing concurrency.
   ///
   /// The Physical Uplink Control Channel (PUCCH) is processed using the high priority executor. This parameter limits

lib/du/du_low/du_low_executor_mapper.cpp

@@ -57,21 +57,21 @@ class du_low_executor_mapper_impl : public du_low_executor_mapper
       const auto& flexible = std::get<du_low_executor_mapper_flexible_exec_config>(config.executors);
 
       auto pdsch_executors = create_task_fork_limiter(
-          flexible.high_priority_executor, flexible.max_pdsch_concurrency, pdsch_queue_sizes, max_pdsch_batch_size);
+          flexible.rt_hi_prio_exec, flexible.max_pdsch_concurrency, pdsch_queue_sizes, max_pdsch_batch_size);
 
-      phy_config.pdcch_executor           = flexible.high_priority_executor;
+      phy_config.pdcch_executor           = flexible.rt_hi_prio_exec;
       phy_config.pdsch_executor           = pdsch_executors[0];
-      phy_config.ssb_executor             = flexible.high_priority_executor;
-      phy_config.csi_rs_executor          = flexible.high_priority_executor;
-      phy_config.prs_executor             = flexible.high_priority_executor;
-      phy_config.dl_grid_executor         = flexible.high_priority_executor;
+      phy_config.ssb_executor             = flexible.rt_hi_prio_exec;
+      phy_config.csi_rs_executor          = flexible.rt_hi_prio_exec;
+      phy_config.prs_executor             = flexible.rt_hi_prio_exec;
+      phy_config.dl_grid_executor         = flexible.non_rt_hi_prio_exec;
       phy_config.pdsch_codeblock_executor = pdsch_executors[0];
-      phy_config.prach_executor           = flexible.high_priority_executor;
+      phy_config.prach_executor           = flexible.non_rt_hi_prio_exec;
       phy_config.pucch_executor =
           create_task_fork_limiter(
-              flexible.high_priority_executor, flexible.max_pucch_concurrency, pucch_queue_sizes, max_pucch_batch_size)
+              flexible.non_rt_hi_prio_exec, flexible.max_pucch_concurrency, pucch_queue_sizes, max_pucch_batch_size)
               .front();
-      auto pusch_srs_execs              = create_task_fork_limiter(flexible.medium_priority_executor,
+      auto pusch_srs_execs              = create_task_fork_limiter(flexible.non_rt_medium_prio_exec,
                                                       flexible.max_pusch_and_srs_concurrency,
                                                       pusch_srs_queue_sizes,
                                                       max_pusch_batch_size);