Update main

Author: codebot

.gitlab/ci/e2e.yml

@@ -410,7 +410,6 @@ test mode ru tsan:
   variables:
     MARKERS: test_mode_not_crash
     KEYWORDS: "test_ru and not 16cell"
-  when: manual
   allow_failure: true
   needs:
     - job: basic tsan
@@ -423,7 +422,6 @@ test mode ru asan:
   variables:
     MARKERS: test_mode_not_crash
     KEYWORDS: "test_ru and not 16cell"
-  when: manual
   allow_failure: true
   needs:
     - job: basic asan
@@ -436,7 +434,6 @@ test mode ru memcheck:
   variables:
     MARKERS: test_mode_not_crash
     KEYWORDS: "test_ru and not 16cell"
-  when: manual
   allow_failure: true
   needs:
     - job: basic memcheck

apps/cu/cu_appconfig.h

@@ -66,7 +66,7 @@ struct cu_appconfig {
   /// F1AP configuration.
   srs_cu::cu_f1ap_appconfig f1ap_cfg;
   /// Buffer pool configuration.
-  buffer_pool_appconfig buffer_pool_config;
+  app_services::buffer_pool_appconfig buffer_pool_config;
   /// Remote control configuration.
   remote_control_appconfig remote_control_config;
   /// Metrics configuration.

apps/cu/cu_appconfig_yaml_writer.cpp

@@ -26,17 +26,12 @@
 #include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
 #include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
 #include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
+#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
 #include "apps/services/metrics/metrics_config_yaml_writer.h"
 #include "cu_appconfig.h"
 
 using namespace srsran;
 
-static void fill_cu_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
-{
-  node["nof_segments"] = config.nof_segments;
-  node["segment_size"] = config.segment_size;
-}
-
 static void fill_cu_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
 {
   node["enabled"]      = config.enabled;
@@ -62,9 +57,9 @@ void srsran::fill_cu_appconfig_in_yaml_schema(YAML::Node& node, const cu_appconf
   app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
   app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
   app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
+  app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
   fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
   fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
-  fill_cu_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
   fill_cu_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
   fill_cu_appconfig_f1ap_section(node, config.f1ap_cfg);
   fill_cu_appconfig_f1u_section(node, config.f1u_cfg);

apps/cu_cp/cu_cp_appconfig.h

@@ -71,7 +71,7 @@ struct cu_cp_appconfig {
   /// F1AP configuration.
   srs_cu_cp::f1ap_appconfig f1ap_cfg;
   /// Buffer pool configuration.
-  buffer_pool_appconfig buffer_pool_config;
+  app_services::buffer_pool_appconfig buffer_pool_config;
   /// Remote control configuration.
   remote_control_appconfig remote_control_config;
   /// Metrics configuration.

apps/cu_up/cu_up_appconfig.h

@@ -68,7 +68,7 @@ struct cu_up_appconfig {
   /// F1-U configuration.
   f1u_sockets_appconfig f1u_cfg;
   /// Buffer pool configuration.
-  buffer_pool_appconfig buffer_pool_config;
+  app_services::buffer_pool_appconfig buffer_pool_config;
   /// Remote control configuration.
   remote_control_appconfig remote_control_config;
   /// Metrics configuration.

apps/du/du_appconfig.h

@@ -75,7 +75,7 @@ struct du_appconfig {
   /// F1-U configuration.
   srs_du::f1u_appconfig f1u_cfg;
   /// Buffer pool configuration.
-  buffer_pool_appconfig buffer_pool_config;
+  app_services::buffer_pool_appconfig buffer_pool_config;
   /// Expert configuration.
   expert_execution_appconfig expert_execution_cfg;
   /// HAL configuration.

apps/du/du_appconfig_yaml_writer.cpp

@@ -26,6 +26,7 @@
 #include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
 #include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
 #include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
+#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
 #include "apps/services/metrics/metrics_config_yaml_writer.h"
 #include "du_appconfig.h"
 
@@ -53,21 +54,18 @@ static void fill_du_appconfig_expert_execution_section(YAML::Node node, const ex
   }
 
   {
-    YAML::Node threads_node = node["threads"];
-    YAML::Node main_node    = threads_node["main_pool"];
+    YAML::Node threads_node   = node["threads"];
+    YAML::Node main_pool_node = threads_node["main_pool"];
     if (config.threads.main_pool.nof_threads.has_value()) {
-      main_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
+      main_pool_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
+    } else {
+      main_pool_node["nof_threads"] = "auto";
     }
-    main_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
+    main_pool_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
+    main_pool_node["backoff_period"]  = config.threads.main_pool.backoff_period;
   }
 }
 
-static void fill_du_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
-{
-  node["nof_segments"] = config.nof_segments;
-  node["segment_size"] = config.segment_size;
-}
-
 static void fill_du_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
 {
   node["enabled"]      = config.enabled;
@@ -92,11 +90,12 @@ void srsran::fill_du_appconfig_in_yaml_schema(YAML::Node& node, const du_appconf
   app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
   app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
   app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
+  node["metrics"]["autostart_stdout_metrics"] = config.metrics_cfg.autostart_stdout_metrics;
+  app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
   fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
   fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
   fill_du_appconfig_hal_section(node, config.hal_config);
   fill_du_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
-  fill_du_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
   fill_du_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
   fill_du_appconfig_f1u_section(node["f1u"], config.f1u_cfg);
   fill_du_appconfig_f1ap_section(node["f1ap"], config.f1ap_cfg);

apps/du_low/du_low_appconfig_yaml_writer.cpp

@@ -43,10 +43,15 @@ static void fill_du_appconfig_expert_execution_section(YAML::Node node, const ex
   }
 
   {
-    YAML::Node threads_node           = node["threads"];
-    YAML::Node main_pool_node         = threads_node["main_pool"];
-    main_pool_node["nof_threads"]     = config.threads.main_pool.nof_threads.value();
+    YAML::Node threads_node   = node["threads"];
+    YAML::Node main_pool_node = threads_node["main_pool"];
+    if (config.threads.main_pool.nof_threads.has_value()) {
+      main_pool_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
+    } else {
+      main_pool_node["nof_threads"] = "auto";
+    }
     main_pool_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
+    main_pool_node["backoff_period"]  = config.threads.main_pool.backoff_period;
   }
 }
 

apps/gnb/gnb_appconfig.h

@@ -63,7 +63,7 @@ struct gnb_appconfig {
   /// Node name.
   std::string ran_node_name = "srsgnb01";
   /// Buffer pool configuration.
-  buffer_pool_appconfig buffer_pool_config;
+  app_services::buffer_pool_appconfig buffer_pool_config;
   /// Expert configuration.
   expert_execution_appconfig expert_execution_cfg;
   /// HAL configuration.

apps/gnb/gnb_appconfig_yaml_writer.cpp

@@ -25,6 +25,7 @@
 #include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
 #include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
 #include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
+#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
 #include "apps/services/metrics/metrics_config_yaml_writer.h"
 #include "gnb_appconfig.h"
 
@@ -64,12 +65,6 @@ static void fill_gnb_appconfig_expert_execution_section(YAML::Node node, const e
   }
 }
 
-static void fill_gnb_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
-{
-  node["nof_segments"] = config.nof_segments;
-  node["segment_size"] = config.segment_size;
-}
-
 static void fill_gnb_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
 {
   node["enabled"]      = config.enabled;
@@ -86,10 +81,11 @@ void srsran::fill_gnb_appconfig_in_yaml_schema(YAML::Node& node, const gnb_appco
   app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
   app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
   app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
+  node["metrics"]["autostart_stdout_metrics"] = config.metrics_cfg.autostart_stdout_metrics;
+  app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
   fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
   fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
   fill_gnb_appconfig_hal_section(node, config.hal_config);
   fill_gnb_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
-  fill_gnb_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
   fill_gnb_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
 }