Update main

Author: codebot

.gitlab/ci/build.yml

@@ -1777,6 +1777,8 @@ basic avx512 dpdk:
   extends: .build_and_unit
   rules:
     - if: $CI_DESCRIPTION =~ /Nightly E2E Tests/
+      when: delayed
+      start_in: 2 hours
   retry: 2
   interruptible: false
   variables:

.gitlab/ci/e2e.yml

@@ -502,7 +502,7 @@ viavi:
     MARKERS: "viavi"
     E2E_LOG_LEVEL: "warning"
     KUBECONFIG_VAR_NAME: "RETINA_NAMESPACE_KUBECONFIG"
-    RETINA_ARGS: "gnb.all.metrics_enable=True"
+    RETINA_ARGS: "gnb.all.metrics_enable=True gnb.all.pcap=True gnb.all.rlc_enable=True gnb.all.rlc_rb_type=srb"
   needs:
     - job: "basic avx512 dpdk"
       artifacts: true

.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.46.13
+RETINA_VERSION=0.46.16
 UBUNTU_VERSION=24.04
 AMARISOFT_VERSION=2023-09-08
 SRSUE_VERSION=23.11

.gitlab/ci/e2e/retina_request_zmq_srsue.yml

@@ -22,6 +22,8 @@
     ephemeral-storage:
       requests: "6G"
       limits: "6G"
+  environment:
+    - RETINA_AGENT_ARGS: --grpc.max_size_file_artifact 209715200
 
 - name: srs-gnb
   type: gnb

.gitlab/configuration.json

@@ -12,6 +12,9 @@
             "protected_branches": [],
             "rule_type": "any_approver",
             "users": []
+        },
+        {
+            "name": "release freeze"
         }
     ],
     "approvals": {

apps/examples/du/phy_factory.cpp

@@ -101,6 +101,7 @@ std::unique_ptr<upper_phy> srsran::create_upper_phy(const upper_phy_params&
   upper_config.pusch_executor             = ul_executor;
   upper_config.pusch_decoder_executor     = nullptr;
   upper_config.prach_executor             = ul_executor;
+  upper_config.srs_executor               = ul_executor;
   upper_config.rx_symbol_request_notifier = rx_symbol_request_notifier;
   upper_config.crc_calculator_type        = "auto";
   upper_config.ldpc_rate_dematcher_type   = "auto";

apps/examples/phy/radio_ssb.cpp

@@ -36,6 +36,7 @@
 #include "upper_phy_ssb_example.h"
 #include "srsran/adt/spsc_queue.h"
 #include "srsran/phy/adapters/phy_error_adapter.h"
+#include "srsran/phy/adapters/phy_metrics_adapter.h"
 #include "srsran/phy/adapters/phy_rg_gateway_adapter.h"
 #include "srsran/phy/adapters/phy_rx_symbol_adapter.h"
 #include "srsran/phy/adapters/phy_rx_symbol_request_adapter.h"
@@ -430,6 +431,7 @@ lower_phy_configuration create_lower_phy_configuration(task_executor*
                                                        task_executor*                dl_task_executor,
                                                        task_executor*                prach_task_executor,
                                                        lower_phy_error_notifier*     error_notifier,
+                                                       lower_phy_metrics_notifier*   metrics_notifier,
                                                        lower_phy_rx_symbol_notifier* rx_symbol_notifier,
                                                        lower_phy_timing_notifier*    timing_notifier,
                                                        srslog::basic_logger*         logger)
@@ -447,6 +449,7 @@ lower_phy_configuration create_lower_phy_configuration(task_executor*
   phy_config.rx_symbol_notifier             = rx_symbol_notifier;
   phy_config.timing_notifier                = timing_notifier;
   phy_config.error_notifier                 = error_notifier;
+  phy_config.metric_notifier                = metrics_notifier;
   phy_config.rx_task_executor               = rx_task_executor;
   phy_config.tx_task_executor               = tx_task_executor;
   phy_config.ul_task_executor               = ul_task_executor;
@@ -592,6 +595,7 @@ int main(int argc, char** argv)
 
   // Create adapters.
   phy_error_adapter             error_adapter(logger);
+  phy_metrics_adapter           metrics_adapter;
   phy_rx_symbol_adapter         rx_symbol_adapter;
   phy_rg_gateway_adapter        rg_gateway_adapter;
   phy_timing_adapter            timing_adapter;
@@ -606,6 +610,7 @@ int main(int argc, char** argv)
                                                                         dl_task_executor.get(),
                                                                         prach_task_executor.get(),
                                                                         &error_adapter,
+                                                                        &metrics_adapter,
                                                                         &rx_symbol_adapter,
                                                                         &timing_adapter,
                                                                         &logger);

apps/examples/radio/rx_power_analyzer.cpp

@@ -45,6 +45,7 @@
 #include "srsran/support/executors/task_worker.h"
 #include "srsran/support/file_sink.h"
 #include <csignal>
+#include <getopt.h>
 #include <random>
 
 using namespace srsran;

apps/gnb/gnb_appconfig.h

@@ -212,7 +212,7 @@ struct pdsch_appconfig {
   /// retransmission is cancelled.
   uint8_t harq_la_ri_drop_threshold{1};
   /// Position for additional DM-RS in DL, see Tables 7.4.1.1.2-3 and 7.4.1.1.2-4 in TS 38.211.
-  uint8_t dmrs_add_pos{1};
+  unsigned dmrs_add_pos{2};
 };
 
 /// PUSCH application configuration.
@@ -270,7 +270,7 @@ struct pusch_appconfig {
   /// Maximum CQI offset that the OLLA algorithm can apply to the reported CQI.
   float olla_max_snr_offset{5.0};
   /// Position for additional DM-RS in UL (see TS 38.211, clause 6.4.1.1.3).
-  uint8_t dmrs_add_pos{2};
+  unsigned dmrs_add_pos{2};
 };
 
 struct pucch_appconfig {

apps/modules/flexible_du/split_ru_dynamic/dynamic_du_factory.cpp

@@ -38,6 +38,7 @@ static du_low_configuration create_du_low_config(const gnb_appconfig&
                                                  task_executor*                        pusch_executor,
                                                  task_executor*                        pusch_decoder_executor,
                                                  task_executor*                        prach_executor,
+                                                 task_executor*                        srs_executor,
                                                  task_executor*                        pdsch_codeblock_executor,
                                                  upper_phy_rx_symbol_request_notifier* rx_symbol_request_notifier)
 {
@@ -78,6 +79,7 @@ static du_low_configuration create_du_low_config(const gnb_appconfig&
   cfg.pusch_executor             = pusch_executor;
   cfg.pusch_decoder_executor     = pusch_decoder_executor;
   cfg.prach_executor             = prach_executor;
+  cfg.srs_executor               = srs_executor;
   cfg.rx_symbol_request_notifier = rx_symbol_request_notifier;
   cfg.crc_calculator_type        = "auto";
   cfg.ldpc_rate_dematcher_type   = "auto";
@@ -150,6 +152,7 @@ std::vector<std::unique_ptr<du>> srsran::make_gnb_dus(const gnb_appconfig&
                                         workers.upper_pusch_exec[i],
                                         workers.upper_pusch_decoder_exec[i],
                                         workers.upper_prach_exec[i],
+                                        workers.upper_srs_exec[i],
                                         workers.upper_pdsch_exec[i],
                                         &rx_symbol_request_notifier);
     // DU-high configuration.