app_unit: refactor of the OFH affinities section in the YAML configuration

Author: AlaiaL

apps/units/flexible_o_du/split_7_2/helpers/ru_ofh_config_cli11_schema.cpp

@@ -398,40 +398,27 @@ static void configure_cli11_cell_affinity_args(CLI::App& app, ru_ofh_unit_cpu_af
       "Policy used for assigning CPU cores to the Radio Unit tasks");
 }
 
-static void configure_cli11_txrx_affinity_args(CLI::App& app, os_sched_affinity_bitmask& mask)
-{
-  add_option_function<std::string>(
-      app,
-      "--ru_txrx_cpus",
-      [&mask](const std::string& value) { parse_affinity_mask(mask, value, "txrx_cpus"); },
-      "Number of CPUs used for the Radio Unit tasks");
-}
-
 static void configure_cli11_expert_execution_args(CLI::App& app, ru_ofh_unit_expert_execution_config& config)
 {
   // Affinities section.
   CLI::App* affinities_subcmd = add_subcommand(app, "affinities", "gNB CPU affinities configuration")->configurable();
+  CLI::App* ofh_subcmd =
+      add_subcommand(*affinities_subcmd, "ofh", "Open Fronthaul CPU affinities configuration")->configurable();
   add_option_function<std::string>(
-      *affinities_subcmd,
+      *ofh_subcmd,
       "--ru_timing_cpu",
       [&config](const std::string& value) { parse_affinity_mask(config.ru_timing_cpu, value, "ru_timing_cpu"); },
       "CPU used for timing in the Radio Unit");
 
   // RU txrx affinity section.
   add_option_cell(
-      *affinities_subcmd,
-      "--ofh",
+      *ofh_subcmd,
+      "--txrx_cpus",
       [&config](const std::vector<std::string>& values) {
         config.txrx_affinities.resize(values.size());
 
         for (unsigned i = 0, e = values.size(); i != e; ++i) {
-          CLI::App subapp("RU tx-rx thread CPU affinities",
-                          "RU tx-rx thread CPU affinities config #" + std::to_string(i));
-          subapp.config_formatter(create_yaml_config_parser());
-          subapp.allow_config_extras();
-          configure_cli11_txrx_affinity_args(subapp, config.txrx_affinities[i]);
-          std::istringstream ss(values[i]);
-          subapp.parse_from_stream(ss);
+          parse_affinity_mask(config.txrx_affinities[i], values[i], "txrx_cpus");
         }
       },
       "Sets the CPU affinities configuration for RU cells tx-rx threads. Number of entries specified defines the "

apps/units/flexible_o_du/split_7_2/helpers/ru_ofh_config_yaml_writer.cpp

@@ -21,24 +21,14 @@ static void fill_ru_ofh_log_section(YAML::Node node, const ru_ofh_unit_logger_co
 
 static void fill_ru_ofh_expert_execution_section(YAML::Node node, const ru_ofh_unit_expert_execution_config& config)
 {
-  {
-    YAML::Node affinities_node       = node["affinities"];
-    affinities_node["ru_timing_cpu"] = fmt::format("{:,}", span<const size_t>(config.ru_timing_cpu.get_cpu_ids()));
-  }
+  YAML::Node affinities_node = node["affinities"];
+  YAML::Node ofh_node        = affinities_node["ofh"];
+  ofh_node["timing_cpu"]     = fmt::format("{:,}", span<const size_t>(config.ru_timing_cpu.get_cpu_ids()));
 
   if (config.txrx_affinities.size() > 0) {
-    YAML::Node affinities_node = node["affinities"];
-    YAML::Node ofh_node        = affinities_node["ofh"];
-    while (config.txrx_affinities.size() > ofh_node.size()) {
-      ofh_node.push_back(YAML::Node());
-    }
-
-    unsigned index = 0;
-    for (auto subnode : ofh_node) {
-      const auto& mask = config.txrx_affinities[index];
-
-      subnode["ru_txrx_cpus"] = fmt::format("{:,}", span<const size_t>(mask.get_cpu_ids()));
-      ++index;
+    YAML::Node txrx_node = ofh_node["txrx_cpus"];
+    for (const auto& affinity : config.txrx_affinities) {
+      txrx_node.push_back(fmt::format("{:,}", span<const size_t>(affinity.get_cpu_ids())));
     }
   }