Update main

Author: codebot

.gitlab/ci-shared/e2e.yml

@@ -126,7 +126,7 @@ variables:
       export LOGNAME=ci_${GROUP}
     # Run Retina
     - |
-      E2E_CMD="retina-launcher ${E2E_FILE_OR_DIR} ${RETINA_LAUNCHER_ARGS} --retina-request=${SRSRANDIR}/.gitlab/ci/e2e/${TESTBED}.yml -k '${KEYWORDS}' -m '${MARKERS}' --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL ${RETINA_PARAM_ARGS}"
+      E2E_CMD="retina-launcher ${E2E_FILE_OR_DIR} ${RETINA_LAUNCHER_ARGS} --retina-request=${SRSRANDIR}/.gitlab/ci/e2e/${TESTBED}.yml -k '${KEYWORDS}' -m '${MARKERS}' --register-parameter ue.all.log_level=$E2E_LOG_LEVEL gnb.all.log_level=$E2E_LOG_LEVEL 5gc.all.log_level=$E2E_LOG_LEVEL ${RETINA_PARAM_ARGS}"
       echo "${E2E_CMD}"
       eval $E2E_CMD
   after_script:

.gitlab/ci/build.yml

@@ -8,7 +8,7 @@
 
 include:
   - project: softwareradiosystems/ci/srsran_project_packaging
-    ref: "8"
+    ref: "9"
     file: .gitlab/ci-shared/package.yml
   - local: .gitlab/ci-shared/build.yml
 
@@ -130,7 +130,9 @@ variables:
             --exclude=${CI_PROJECT_DIR}/plugins/.*/include/srsran/asn1/nrppa/.* \
             --exclude=${CI_PROJECT_DIR}/plugins/.*/lib/asn1/nrppa/.* \
             --exclude-lines-by-pattern \".*srsran_assert.*|.*srsran_sanity_check.*\" \
-            --root=${CI_PROJECT_DIR}"
+            --root=${CI_PROJECT_DIR} \
+            --gcov-ignore-parse-errors=all \
+            --merge-mode-functions=merge-use-line-min"
 
           echo "+ gcovr: Coverage generation"
           if ! output=$(gcovr $common_options --keep 2>&1); then

.gitlab/ci/builders.yml

@@ -300,7 +300,7 @@ ubuntu-dpdk-builder arm64:
     - |
       mkdir -p ${CI_PROJECT_DIR}/${CONTEXT}/lib
       DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends curl apt-transport-https ca-certificates xz-utils
-      curl --header "PRIVATE-TOKEN: $CODEBOT_TOKEN" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/wls/25.03/libwls.a" -o ${CI_PROJECT_DIR}/${CONTEXT}/lib/libwls.a
+      curl --header "PRIVATE-TOKEN: $CODEBOT_TOKEN" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/wls/25.03/libwls.so" -o ${CI_PROJECT_DIR}/${CONTEXT}/lib/libwls.so
     - cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
     - mkdir -p $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk
     - ls -lah $CONTEXT $CONTEXT/lib $CONTEXT/uhd $CONTEXT/dpdk

.gitlab/ci/builders/archlinux/Dockerfile

@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-ARG VERSION=base-20250511.0.348143
+ARG VERSION=base-20250615.0.365905
 FROM archlinux:$VERSION
 
 ADD install_dependencies.sh /usr/local/bin

.gitlab/ci/e2e/.env

@@ -1,6 +1,6 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.68.2
+RETINA_VERSION=0.68.5
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 AMARISOFT_S72_NTN_VERSION=2024-12-13

.gitlab/ci/e2e/s72_uesim.yml

@@ -29,25 +29,6 @@
     - type: ru
       model: amariue-s72
 
-- name: amarisoft-mme
-  type: 5gc
-  image: ${RETINA_REGISTRY_PREFIX}/amarisoft5gc-remote:${RETINA_VERSION}
-  taints: ["purpose=retina"]
-  requirements:
-    arch: amd64
-    cpu:
-      requests: 4
-      limits: 4
-    memory:
-      requests: "4G"
-      limits: "4G"
-    ephemeral-storage:
-      requests: "6G"
-      limits: "6G"
-  resources:
-    - type: emulator
-      model: callbox
-
 - name: srs-gnb
   type: gnb
   image: ${RETINA_REGISTRY_PREFIX}/srsgnb:${RETINA_VERSION}
@@ -77,3 +58,22 @@
     - local_path: ${GNB_BUILD_PATH}/apps/gnb/gnb
       remote_path: /usr/local/bin/gnb
       is_executable: true
+
+- name: amarisoft-mme
+  type: 5gc
+  image: ${RETINA_REGISTRY_PREFIX}/amarisoft5gc-remote:${RETINA_VERSION}
+  taints: ["purpose=retina"]
+  requirements:
+    arch: amd64
+    cpu:
+      requests: 4
+      limits: 4
+    memory:
+      requests: "4G"
+      limits: "4G"
+    ephemeral-storage:
+      requests: "6G"
+      limits: "6G"
+  resources:
+    - type: emulator
+      model: callbox

apps/services/worker_manager/worker_manager.cpp

@@ -21,8 +21,11 @@
  */
 
 #include "worker_manager.h"
+#include "apps/helpers/metrics/metrics_helpers.h"
 #include "srsran/adt/byte_buffer.h"
 #include "srsran/du/du_high/du_high_executor_mapper.h"
+#include "srsran/srslog/srslog.h"
+#include "srsran/support/executors/concurrent_metrics_executor.h"
 #include "srsran/support/executors/inline_task_executor.h"
 
 using namespace srsran;
@@ -269,7 +272,8 @@ void worker_manager::create_cu_up_executors(const worker_manager_config::cu_up_c
                                                                                     *exec_map.at("low_prio_exec"),
                                                                                     config.dedicated_io_ul_strand,
                                                                                     &timers,
-                                                                                    config.executor_tracing_enable});
+                                                                                    config.executor_tracing_enable,
+                                                                                    config.metrics_period});
 }
 
 void worker_manager::create_du_executors(const worker_manager_config::du_high_config&        du_hi,
@@ -336,7 +340,7 @@ execution_config_helper::worker_pool worker_manager::create_low_prio_workers(uns
       // Left empty, is filled later.
       {},
       std::chrono::microseconds{100},
-      os_thread_realtime_priority::no_realtime(),
+      os_thread_realtime_priority::min(),
       std::vector<os_sched_affinity_bitmask>{low_prio_mask}};
 
   return non_rt_pool;
@@ -480,10 +484,6 @@ worker_manager::create_du_crit_path_prio_executors(unsigned
         report_fatal_error("Failed to instantiate {} execution context", ul_worker_pool.name);
       }
 
-      upper_pucch_exec.push_back(exec_mng.executors().at(l1_pucch_exec_name));
-      upper_pusch_exec.push_back(exec_mng.executors().at(l1_pusch_exec_name));
-      upper_srs_exec.push_back(exec_mng.executors().at(l1_srs_exec_name));
-
       // Instantiate dedicated worker pool for high priority tasks such as L2, the upper physical layer downlink
       // processing, and the PRACH detector. This worker pool comprises four different priority queues where the L2 and
       // the PRACH detector queues have the highest priority.
@@ -504,9 +504,58 @@ worker_manager::create_du_crit_path_prio_executors(unsigned
         report_fatal_error("Failed to instantiate {} execution context", dl_worker_pool.name);
       }
 
-      du_low_dl_executors.push_back(exec_mng.executors().at(l1_dl_exec_name));
-      upper_prach_exec.push_back(exec_mng.executors().at(l1_prach_exec_name));
-      upper_pdsch_exec.push_back(exec_mng.executors().at(l1_pdsch_exec_name));
+      // TODO: move this to a dedicated worker mapper.
+      task_executor* cell_upper_dl_exec    = exec_mng.executors().at(l1_dl_exec_name);
+      task_executor* cell_upper_pucch_exec = exec_mng.executors().at(l1_pucch_exec_name);
+      task_executor* cell_upper_pusch_exec = exec_mng.executors().at(l1_pusch_exec_name);
+      task_executor* cell_upper_srs_exec   = exec_mng.executors().at(l1_srs_exec_name);
+      task_executor* cell_upper_prach_exec = exec_mng.executors().at(l1_prach_exec_name);
+      task_executor* cell_upper_pdsch_exec = exec_mng.executors().at(l1_pdsch_exec_name);
+
+      // Wrap executors with metrics.
+      if (du_low.value().metrics_period.has_value()) {
+        srslog::log_channel& metrics_logger = app_helpers::fetch_logger_metrics_log_channel();
+
+        std::chrono::milliseconds      metrics_period = du_low.value().metrics_period.value();
+        std::unique_ptr<task_executor> executor;
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_dl_exec_name, *cell_upper_dl_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_dl_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_pucch_exec_name, *cell_upper_pucch_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_pucch_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_pusch_exec_name, *cell_upper_pusch_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_pusch_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_srs_exec_name, *cell_upper_srs_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_srs_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_prach_exec_name, *cell_upper_prach_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_prach_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+
+        executor = make_concurrent_metrics_executor_ptr(
+            l1_pdsch_exec_name, *cell_upper_pdsch_exec, *metrics_exec, metrics_logger, metrics_period);
+        cell_upper_pdsch_exec = executor.get();
+        executor_decorators_exec.emplace_back(std::move(executor));
+      }
+
+      du_low_dl_executors.push_back(cell_upper_dl_exec);
+      upper_pucch_exec.push_back(cell_upper_pucch_exec);
+      upper_pusch_exec.push_back(cell_upper_pusch_exec);
+      upper_srs_exec.push_back(cell_upper_srs_exec);
+      upper_prach_exec.push_back(cell_upper_prach_exec);
+      upper_pdsch_exec.push_back(cell_upper_pdsch_exec);
       l2_execs.push_back(exec_mng.executors().at(l2_exec_name));
     }
 
@@ -554,7 +603,21 @@ worker_manager::create_du_crit_path_prio_executors(unsigned
       report_fatal_error("Failed to instantiate {} execution context", pusch_decoder_worker_pool.name);
     }
 
-    upper_pusch_decoder_exec.push_back(exec_mng.executors().at(pusch_decoder_exec_name));
+    task_executor* cell_upper_pusch_decoder_exec = exec_mng.executors().at(pusch_decoder_exec_name);
+    if (du_low.value().metrics_period.has_value()) {
+      srslog::log_channel& metrics_logger = app_helpers::fetch_logger_metrics_log_channel();
+
+      std::unique_ptr<task_executor> concurrent_metrics_executor =
+          make_concurrent_metrics_executor_ptr(pusch_decoder_exec_name,
+                                               *cell_upper_pusch_decoder_exec,
+                                               *metrics_exec,
+                                               metrics_logger,
+                                               du_low.value().metrics_period.value());
+      cell_upper_pusch_decoder_exec = concurrent_metrics_executor.get();
+      executor_decorators_exec.emplace_back(std::move(concurrent_metrics_executor));
+    }
+
+    upper_pusch_decoder_exec.push_back(cell_upper_pusch_decoder_exec);
   }
 
   return desc;

apps/services/worker_manager/worker_manager.h

@@ -104,6 +104,9 @@ struct worker_manager : public worker_manager_executor_getter {
   /// Manager of execution contexts and respective executors instantiated by the application.
   task_execution_manager exec_mng;
 
+  /// Collection of task executor decorators.
+  std::vector<std::unique_ptr<task_executor>> executor_decorators_exec;
+
   os_sched_affinity_manager low_prio_affinity_mng;
   os_sched_affinity_bitmask ru_timing_mask;
 

apps/services/worker_manager/worker_manager_config.h

@@ -70,11 +70,12 @@ struct worker_manager_config {
 
   /// DU low worker configuration.
   struct du_low_config {
-    bool     is_blocking_mode_active;
-    unsigned nof_ul_threads;
-    unsigned nof_dl_threads;
-    unsigned nof_pusch_decoder_threads;
-    unsigned nof_cells;
+    bool                                     is_blocking_mode_active;
+    unsigned                                 nof_ul_threads;
+    unsigned                                 nof_dl_threads;
+    unsigned                                 nof_pusch_decoder_threads;
+    unsigned                                 nof_cells;
+    std::optional<std::chrono::milliseconds> metrics_period;
   };
 
   /// DU high worker configuration.
@@ -104,6 +105,8 @@ struct worker_manager_config {
     bool dedicated_io_ul_strand = true;
     /// Whether to enable task tracing.
     bool executor_tracing_enable = false;
+    /// Whether to log performance metrics for the CU-UP executors.
+    std::optional<std::chrono::milliseconds> metrics_period;
   };
 
   /// PCAP worker configuration.