app,cu_up: change location of CU-UP executors tracing in CLI11

Author: alvasMan

apps/units/o_cu_up/cu_up/cu_up_unit_config.h

@@ -38,6 +38,10 @@ struct cu_up_unit_metrics_config {
   cu_up_unit_metrics_layer_config layers_cfg;
 };
 
+struct cu_up_unit_trace_config {
+  bool cu_up_enable = false;
+};
+
 struct cu_up_unit_ngu_socket_config {
   std::string   bind_addr      = "127.0.0.1";
   std::string   bind_interface = "auto";
@@ -90,7 +94,6 @@ struct cu_up_unit_execution_config {
   uint32_t ul_ue_executor_queue_size   = 8192;
   uint32_t ctrl_ue_executor_queue_size = 8192;
   unsigned strand_batch_size           = 256;
-  bool     executor_tracing_enable     = false;
 };
 
 /// CU-UP application unit configuration.
@@ -109,6 +112,8 @@ struct cu_up_unit_config {
   cu_up_unit_metrics_config metrics;
   /// Loggers.
   cu_up_unit_logger_config loggers;
+  /// Trace.
+  cu_up_unit_trace_config trace_cfg;
   /// PCAPs.
   cu_up_unit_pcap_config pcap_cfg;
   /// QoS configuration.

apps/units/o_cu_up/cu_up/cu_up_unit_config_cli11_schema.cpp

@@ -69,12 +69,6 @@ static void configure_cli11_execution_args(CLI::App& app, cu_up_unit_execution_c
       ->capture_default_str();
   add_option(*queues_subcmd, "--cu_up_strand_batch_size", exec_cfg.strand_batch_size, "CU-UP's strands batch size")
       ->capture_default_str();
-  CLI::App* tracing_subcmd = add_subcommand(app, "tracing", "Task executor tracing parameters")->configurable();
-  add_option(*tracing_subcmd,
-             "--cu_up_executor_tracing_enable",
-             exec_cfg.executor_tracing_enable,
-             "Enable tracing for CU-UP executors")
-      ->capture_default_str();
 }
 
 static void configure_cli11_ngu_args(CLI::App& app, cu_up_unit_ngu_config& ngu_params)
@@ -196,6 +190,13 @@ static void configure_cli11_metrics_args(CLI::App& app, cu_up_unit_metrics_confi
   configure_cli11_metrics_layers_args(*layers_subcmd, metrics_params.layers_cfg);
 }
 
+static void configure_cli11_trace(CLI::App& app, cu_up_unit_trace_config& trace_params)
+{
+  CLI::App* layers_subcmd = add_subcommand(app, "layers", "Metrics configuration")->configurable();
+  add_option(*layers_subcmd, "--cu_up_enable", trace_params.cu_up_enable, "Enable tracing for CU-UP executors")
+      ->capture_default_str();
+}
+
 static void configure_cli11_f1u_cu_up_args(CLI::App& app, cu_cp_unit_f1u_config& f1u_cu_up_params)
 {
   app.add_option("--backoff_timer", f1u_cu_up_params.t_notify, "F1-U backoff timer (ms)")->capture_default_str();
@@ -244,6 +245,10 @@ void srsran::configure_cli11_with_cu_up_unit_config_schema(CLI::App& app, cu_up_
   configure_cli11_metrics_args(*metrics_subcmd, unit_cfg.metrics);
   app_helpers::configure_cli11_with_metrics_appconfig_schema(app, unit_cfg.metrics.common_metrics_cfg);
 
+  // Trace section.
+  CLI::App* tracing_subcmd = add_subcommand(app, "trace", "General tracer configuration")->configurable();
+  configure_cli11_trace(*tracing_subcmd, unit_cfg.trace_cfg);
+
   // QoS section.
   auto qos_lambda = [&unit_cfg](const std::vector<std::string>& values) {
     // Prepare the radio bearers

apps/units/o_cu_up/cu_up/cu_up_unit_config_translators.cpp

@@ -92,7 +92,7 @@ void srsran::fill_cu_up_worker_manager_config(worker_manager_config& config, con
   config.cu_up_cfg->ul_ue_executor_queue_size   = unit_cfg.exec_cfg.ul_ue_executor_queue_size;
   config.cu_up_cfg->ctrl_ue_executor_queue_size = unit_cfg.exec_cfg.ctrl_ue_executor_queue_size;
   config.cu_up_cfg->strand_batch_size           = unit_cfg.exec_cfg.strand_batch_size;
-  config.cu_up_cfg->executor_tracing_enable     = unit_cfg.exec_cfg.executor_tracing_enable;
+  config.cu_up_cfg->executor_tracing_enable     = unit_cfg.trace_cfg.cu_up_enable;
   config.cu_up_cfg->skip_cu_up_executor         = unit_cfg.metrics.layers_cfg.skip_cu_up_executor;
 
   auto& pcap_cfg = config.pcap_cfg;

apps/units/o_cu_up/cu_up/cu_up_unit_config_validator.cpp

@@ -26,9 +26,9 @@ static bool validate_qos_appconfig(span<const cu_up_unit_qos_config> config)
   return true;
 }
 
-static bool validate_cu_up_expert_execution_appconfig(const cu_up_unit_execution_config& exec_cfg, bool tracing_enabled)
+static bool validate_cu_up_trace_appconfig(const cu_up_unit_trace_config& exec_cfg, bool tracing_enabled)
 {
-  if (exec_cfg.executor_tracing_enable && !tracing_enabled) {
+  if (exec_cfg.cu_up_enable && !tracing_enabled) {
     fmt::println("Tracing requested for CU-UP executors, but tracing is disabled");
     return false;
   }
@@ -49,7 +49,8 @@ bool srsran::validate_cu_up_unit_config(const cu_up_unit_config& config, bool tr
   if (!validate_qos_appconfig(config.qos_cfg)) {
     return false;
   }
-  if (!validate_cu_up_expert_execution_appconfig(config.exec_cfg, tracing_enabled)) {
+
+  if (!validate_cu_up_trace_appconfig(config.trace_cfg, tracing_enabled)) {
     return false;
   }
 

apps/units/o_cu_up/cu_up/cu_up_unit_config_yaml_writer.cpp

@@ -64,6 +64,12 @@ static void fill_cu_up_metrics_section(YAML::Node node, const cu_up_unit_metrics
   fill_cu_up_metrics_layers_section(node["layers"], config.layers_cfg);
 }
 
+static void fill_cu_up_trace_section(YAML::Node node, const cu_up_unit_trace_config& config)
+{
+  auto layers_node            = node["layers"];
+  layers_node["cu_up_enable"] = config.cu_up_enable;
+}
+
 static void fill_cu_up_pcap_section(YAML::Node node, const cu_up_unit_pcap_config& config)
 {
   node["n3_filename"]   = config.n3.filename;
@@ -134,6 +140,8 @@ void srsran::fill_cu_up_config_in_yaml_schema(YAML::Node& node, const cu_up_unit
 
   app_helpers::fill_metrics_appconfig_in_yaml_schema(node, config.metrics.common_metrics_cfg);
 
+  fill_cu_up_trace_section(node["trace"], config.trace_cfg);
+
   YAML::Node cu_up_node = node["cu_up"];
   fill_cu_up_section(cu_up_node, config);
   fill_cu_up_log_section(cu_up_node["log"], config.loggers);