Update main

# Conflicts:
#	include/srsran/srsvec/aligned_vec.h
#	lib/phy/upper/channel_coding/ldpc/ldpc_segmenter_impl.cpp
#	lib/phy/upper/channel_coding/ldpc/ldpc_segmenter_impl.h
#	lib/srsvec/aligned_vec.cpp
#	lib/support/sdu_window_impl.h
#	tests/unittests/phy/upper/channel_processors/pucch/pucch_demodulator_format2_test_data.tar.gz
#	tests/unittests/phy/upper/channel_processors/pucch/pucch_demodulator_format3_test_data.tar.gz
#	tests/unittests/phy/upper/signal_processors/srs/srs_estimator_test_data.tar.gz
#	tests/unittests/srsvec/srsvec_aligned_test.cpp

.gitlab-ci.yml

@@ -503,6 +503,14 @@ pages:
       cd ..
     - mkdir public/doxygen
     - rsync -a build/docs/html/ public/doxygen/
+    - |
+      # Remove bigger file if size is bigger than 900MB
+      while [ $(du -s public | awk '{print $1}') -gt 921600 ]; do
+        file_to_remove=$(find public -type f ! -name "*.html" ! -name "*.js" -exec ls -l {} + | sort -k5 -n -r | awk 'NR==1' | awk '{print $NF}')
+        file_size=$(du -h "$file_to_remove" | awk '{print $1}')
+        echo "Removing file: $file_to_remove (Size: $file_size)"
+        rm -f "$file_to_remove"
+      done
   after_script:
     - |
       if [ $CI_JOB_STATUS = "failed" ]; then

.gitlab/ci-shared/build.yml

@@ -61,9 +61,16 @@ variables:
     FORCE_DEBUG_INFO: "" # Empty for cmake default
     MARCH: "" # Empty for cmake default
     MTUNE: "" # Empty for cmake default
+    # CACHE
+    CCACHE_MAXSIZE: 3G
     # TEST
     TEST_EXECUTION_TIMEOUT: 0
     # CI
+    TRANSFER_METER_FREQUENCY: 5s
+    ARTIFACT_COMPRESSION_LEVEL: slowest
+    CACHE_COMPRESSION_LEVEL: slowest
+    CACHE_REQUEST_TIMEOUT: 5 # minutes - 10 by default
+    # K8
     KUBERNETES_CPU_REQUEST: 6
     KUBERNETES_CPU_LIMIT: 6
     KUBERNETES_MEMORY_REQUEST: 12Gi

.gitlab/ci-shared/e2e.yml

@@ -66,7 +66,9 @@ variables:
     name: ${RETINA_REGISTRY_PREFIX}/launcher:${RETINA_VERSION}
     entrypoint: ["/bin/sh", "-c"]
   variables:
-    ARTIFACT_COMPRESSION_LEVEL: "slowest"
+    TRANSFER_METER_FREQUENCY: 5s
+    ARTIFACT_COMPRESSION_LEVEL: slowest
+    RUNNER_AFTER_SCRIPT_TIMEOUT: 1m
     KUBERNETES_CPU_REQUEST: 2
     KUBERNETES_CPU_LIMIT: 2
     KUBERNETES_MEMORY_REQUEST: 2Gi

.gitlab/ci/build.yml

@@ -732,6 +732,11 @@ smoke valgrind update cache:
       start_in: 30 minutes
   interruptible: false
   retry: 2
+  after_script:
+    - *build_after_script
+  artifacts:
+    <<: *build_artifacts
+    when: on_failure
   cache:
     - *cache_build_set
 

.gitlab/ci/docker.yml

@@ -291,6 +291,8 @@ grafana server image latest:
     KUBERNETES_CPU_LIMIT: 6
     KUBERNETES_MEMORY_REQUEST: 12Gi
     KUBERNETES_MEMORY_LIMIT: 12Gi
+    KUBERNETES_EPHEMERAL_STORAGE_REQUEST: "50G"
+    KUBERNETES_EPHEMERAL_STORAGE_LIMIT: "50G"
     REGISTRY_URI: $GITLAB_REGISTRY_URI
     CONTEXT: ${CI_PROJECT_DIR}
     DOCKERFILE: docker

.gitlab/ci/e2e.yml

@@ -210,22 +210,7 @@ amari 8UE:
   parallel:
     matrix:
       - KEYWORDS:
-          ["reestablishment and sequentially", "handover and sequentially"]
-
-amari 8UE [attach_detach 2024-03-15]:
-  extends: .zmq-uesim
-  variables:
-    MARKERS: "zmq and not smoke"
-    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
-    KEYWORDS: "attach_detach"
-  allow_failure: true
-
-amari 8UE [attach_detach 2023-09-08]:
-  extends: .zmq
-  variables:
-    MARKERS: "zmq and not smoke"
-    RETINA_PARAM_ARGS: "gnb.all.pcap=True gnb.all.rlc_enable=False gnb.all.enable_integrity_protection=True"
-    KEYWORDS: "attach_detach"
+          ["reestablishment and sequentially", "handover and sequentially", "attach_detach"]
 
 amari 8UE beta:
   extends: amari 8UE
@@ -486,7 +471,8 @@ viavi:
       - KEYWORDS:
           [
             "ideal and 1UE",
-            "ideal and 32UE and not experimental",
+            "ideal and 32UE and not experimental and not tdd",
+            "tdd",
             "fading and 1UE",
             "fading and 32UE",
             "birth-death and 1UE",

.gitlab/ci/e2e/.env

@@ -1,14 +1,14 @@
 SRSGNB_REGISTRY_URI=registry.gitlab.com/softwareradiosystems/srsgnb
 RETINA_REGISTRY_PREFIX=registry.gitlab.com/softwareradiosystems/ci/retina
-RETINA_VERSION=0.54.9
+RETINA_VERSION=0.54.12
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11
 OPEN5GS_VERSION=2.7.0
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 METRICS_SERVER_VERSION=1.7.3
 DPDK_VERSION=23.11.1
-ZMQ_HOSTLABEL_0=kubernetes.io/hostname=rfci-virt-master
+ZMQ_HOSTLABEL_0=kubernetes.io/hostname=hp-generic-2
 ZMQ_HOSTLABEL_1=kubernetes.io/hostname=srskit2
 AMARISOFT_TXRX_BINARY_PATH=../../build_trx_srsran/libtrx_srsran.so
 GNB_BINARY_PATH=../../build/apps/gnb/gnb

.gitlab/ci/e2e/retina_request_zmq.yml

@@ -15,8 +15,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -40,8 +40,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -62,8 +62,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 2
-      limits: 2
+      requests: 1
+      limits: 1
     memory:
       requests: "8G"
       limits: "8G"

.gitlab/ci/e2e/retina_request_zmq_cudu.yml

@@ -15,8 +15,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -40,8 +40,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -63,8 +63,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 2
-      limits: 2
+      requests: 1
+      limits: 1
     memory:
       requests: "8G"
       limits: "8G"

.gitlab/ci/e2e/retina_request_zmq_deb.yml

@@ -15,8 +15,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -40,8 +40,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -60,8 +60,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 2
-      limits: 2
+      requests: 1
+      limits: 1
     memory:
       requests: "8G"
       limits: "8G"

.gitlab/ci/e2e/retina_request_zmq_srsue.yml

@@ -14,8 +14,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -35,8 +35,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 10
-      limits: 10
+      requests: 5
+      limits: 5
     memory:
       requests: "26G"
       limits: "26G"
@@ -57,8 +57,8 @@
   requirements:
     arch: amd64
     cpu:
-      requests: 2
-      limits: 2
+      requests: 1
+      limits: 1
     memory:
       requests: "8G"
       limits: "8G"

CMakeLists.txt

@@ -71,6 +71,7 @@ option(STOP_ON_WARNING       "Interrupt application on warning"         OFF)
 option(ENABLE_WERROR         "Stop compilation on errors"               ON)
 option(ENABLE_TSAN           "Enable clang thread sanitizer"            OFF)
 option(ENABLE_ASAN           "Enable clang address sanitizer"           OFF)
+option(ENABLE_RTSAN          "Enable clang real-time sanitizer"         OFF)
 option(ENABLE_GCOV           "Enable code coverage"                     OFF)
 option(ENABLE_UHD            "Enable UHD"                               ON)
 option(ENABLE_ZEROMQ         "Enable ZeroMQ"                            OFF)
@@ -210,6 +211,12 @@ if (ENABLE_TSAN)
     add_definitions(-DENABLE_TSAN)
 endif (ENABLE_TSAN)
 
+if (ENABLE_RTSAN)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=realtime")
+    ADD_CXX_COMPILER_FLAG_IF_AVAILABLE("-fsanitize=realtime" HAVE_RPATH_FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=realtime")
+endif ()
+
 if (FORCE_DEBUG_INFO)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 endif (FORCE_DEBUG_INFO)

apps/cu/CMakeLists.txt

@@ -23,7 +23,6 @@ add_executable(srscu
 	cu_appconfig_cli11_schema.cpp
 	cu_appconfig_validator.cpp
 	cu_appconfig_yaml_writer.cpp
-    ../gnb/gnb_appconfig_translators.cpp
 )
 
 install(TARGETS srscu
@@ -39,7 +38,7 @@ target_link_libraries(srscu
         srsran_f1c_gateway
         srsran_e1_gateway
         srsran_e2
-        srsgnb_app_f1u_cu_up_split_connector
+        srsran_f1u_cu_up_split_connector
         srsran_pcap
         ngap_asn1
         )

apps/cu/cu.cpp

@@ -20,12 +20,35 @@
  *
  */
 
+#include "apps/cu/adapters/e2_gateways.h"
+#include "apps/cu/cu_appconfig_cli11_schema.h"
+#include "apps/services/application_message_banners.h"
+#include "apps/services/application_tracer.h"
+#include "apps/services/buffer_pool/buffer_pool_manager.h"
+#include "apps/services/metrics/metrics_manager.h"
+#include "apps/services/metrics/metrics_notifier_proxy.h"
+#include "apps/services/stdin_command_dispatcher.h"
+#include "apps/services/worker_manager/worker_manager.h"
+#include "apps/services/worker_manager/worker_manager_config.h"
+#include "apps/units/cu_cp/cu_cp_application_unit.h"
+#include "apps/units/cu_cp/cu_cp_config_translators.h"
+#include "apps/units/cu_cp/cu_cp_unit_config.h"
+#include "apps/units/cu_cp/pcap_factory.h"
+#include "apps/units/cu_up/cu_up_application_unit.h"
+#include "apps/units/cu_up/cu_up_unit_config.h"
+#include "apps/units/cu_up/pcap_factory.h"
+#include "cu_appconfig.h"
+#include "cu_appconfig_validator.h"
+#include "cu_appconfig_yaml_writer.h"
+#include "srsran/cu_up/cu_up.h"
+#include "srsran/e1ap/gateways/e1_local_connector_factory.h"
 #include "srsran/f1ap/gateways/f1c_network_server_factory.h"
 #include "srsran/f1u/cu_up/split_connector/f1u_split_connector_factory.h"
 #include "srsran/gateways/udp_network_gateway.h"
 #include "srsran/gtpu/gtpu_config.h"
 #include "srsran/gtpu/gtpu_demux_factory.h"
 #include "srsran/gtpu/ngu_gateway.h"
+#include "srsran/ngap/gateways/n2_connection_client_factory.h"
 #include "srsran/pcap/dlt_pcap.h"
 #include "srsran/support/backtrace.h"
 #include "srsran/support/config_parsers.h"
@@ -40,36 +63,6 @@
 #include "srsran/support/tracing/event_tracing.h"
 #include "srsran/support/versioning/build_info.h"
 #include "srsran/support/versioning/version.h"
-
-#include "apps/cu/cu_appconfig_cli11_schema.h"
-#include "apps/units/cu_cp/cu_cp_application_unit.h"
-#include "apps/units/cu_cp/cu_cp_config_translators.h"
-#include "apps/units/cu_cp/cu_cp_unit_config.h"
-#include "apps/units/cu_cp/pcap_factory.h"
-#include "apps/units/cu_up/cu_up_application_unit.h"
-#include "apps/units/cu_up/cu_up_unit_config.h"
-#include "apps/units/cu_up/pcap_factory.h"
-#include "srsran/cu_up/cu_up.h"
-
-// TODO remove apps/gnb/*.h
-#include "apps/cu/adapters/e2_gateways.h"
-#include "apps/gnb/gnb_appconfig_translators.h"
-
-#include "apps/services/application_message_banners.h"
-#include "apps/services/application_tracer.h"
-#include "apps/services/buffer_pool/buffer_pool_manager.h"
-#include "apps/services/metrics/metrics_manager.h"
-#include "apps/services/metrics/metrics_notifier_proxy.h"
-#include "apps/services/stdin_command_dispatcher.h"
-#include "apps/services/worker_manager.h"
-#include "apps/services/worker_manager_config.h"
-#include "cu_appconfig.h"
-#include "cu_appconfig_validator.h"
-#include "cu_appconfig_yaml_writer.h"
-
-#include "srsran/e1ap/gateways/e1_local_connector_factory.h"
-#include "srsran/ngap/gateways/n2_connection_client_factory.h"
-
 #include <atomic>
 #include <thread>
 

apps/cu/cu_appconfig.h

@@ -22,9 +22,10 @@
 
 #pragma once
 
-#include "apps/gnb/gnb_appconfig.h"
 #include "apps/services/buffer_pool/buffer_pool_appconfig.h"
+#include "apps/services/e2/e2_appconfig.h"
 #include "apps/services/logger/logger_appconfig.h"
+#include "apps/services/worker_manager/worker_manager_appconfig.h"
 #include <string>
 
 namespace srsran {
@@ -46,7 +47,7 @@ struct cu_f1ap_appconfig {
 
 } // namespace srs_cu
 
-/// Monolithic gnb application configuration.
+/// CU application configuration.
 struct cu_appconfig {
   /// Default constructor to update the log filename.
   cu_appconfig() { log_cfg.filename = "/tmp/cu.log"; }

apps/cu/cu_appconfig_cli11_schema.cpp

@@ -23,9 +23,9 @@
 #include "cu_appconfig_cli11_schema.h"
 #include "apps/services/buffer_pool/buffer_pool_appconfig_cli11_schema.h"
 #include "apps/services/logger/logger_appconfig_cli11_schema.h"
+#include "apps/services/worker_manager/worker_manager_cli11_schema.h"
 #include "cu_appconfig.h"
 #include "srsran/support/cli11_utils.h"
-#include "CLI/CLI11.hpp"
 
 using namespace srsran;
 
@@ -60,6 +60,9 @@ void srsran::configure_cli11_with_cu_appconfig_schema(CLI::App& app, cu_appconfi
   // Buffer pool section.
   configure_cli11_with_buffer_pool_appconfig_schema(app, cu_cfg.buffer_pool_config);
 
+  // Expert execution section.
+  configure_cli11_with_worker_manager_appconfig_schema(app, cu_cfg.expert_execution_cfg);
+
   // F1AP section.
   CLI::App* cu_cp_subcmd = add_subcommand(app, "cu_cp", "CU-UP parameters")->configurable();
   CLI::App* f1ap_subcmd  = add_subcommand(*cu_cp_subcmd, "f1ap", "F1AP parameters")->configurable();