Skip to content

Commit 5f18227

Browse files
falucocodebot
authored andcommitted
yaml: Improve yaml writers and add some missing params that were not written
1 parent 7d96a0c commit 5f18227

24 files changed

+135
-52
lines changed

apps/cu/cu_appconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct cu_appconfig {
5454
/// F1AP configuration.
5555
srs_cu::cu_f1ap_appconfig f1ap_cfg;
5656
/// Buffer pool configuration.
57-
buffer_pool_appconfig buffer_pool_config;
57+
app_services::buffer_pool_appconfig buffer_pool_config;
5858
/// Remote control configuration.
5959
remote_control_appconfig remote_control_config;
6060
/// Metrics configuration.

apps/cu/cu_appconfig_yaml_writer.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@
1414
#include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
1515
#include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
1616
#include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
17+
#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
1718
#include "apps/services/metrics/metrics_config_yaml_writer.h"
1819
#include "cu_appconfig.h"
1920

2021
using namespace srsran;
2122

22-
static void fill_cu_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
23-
{
24-
node["nof_segments"] = config.nof_segments;
25-
node["segment_size"] = config.segment_size;
26-
}
27-
2823
static void fill_cu_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
2924
{
3025
node["enabled"] = config.enabled;
@@ -50,9 +45,9 @@ void srsran::fill_cu_appconfig_in_yaml_schema(YAML::Node& node, const cu_appconf
5045
app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
5146
app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
5247
app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
48+
app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
5349
fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
5450
fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
55-
fill_cu_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
5651
fill_cu_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
5752
fill_cu_appconfig_f1ap_section(node, config.f1ap_cfg);
5853
fill_cu_appconfig_f1u_section(node, config.f1u_cfg);

apps/cu_cp/cu_cp_appconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct cu_cp_appconfig {
5959
/// F1AP configuration.
6060
srs_cu_cp::f1ap_appconfig f1ap_cfg;
6161
/// Buffer pool configuration.
62-
buffer_pool_appconfig buffer_pool_config;
62+
app_services::buffer_pool_appconfig buffer_pool_config;
6363
/// Remote control configuration.
6464
remote_control_appconfig remote_control_config;
6565
/// Metrics configuration.

apps/cu_up/cu_up_appconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct cu_up_appconfig {
5656
/// F1-U configuration.
5757
f1u_sockets_appconfig f1u_cfg;
5858
/// Buffer pool configuration.
59-
buffer_pool_appconfig buffer_pool_config;
59+
app_services::buffer_pool_appconfig buffer_pool_config;
6060
/// Remote control configuration.
6161
remote_control_appconfig remote_control_config;
6262
/// Metrics configuration.

apps/du/du_appconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct du_appconfig {
6363
/// F1-U configuration.
6464
srs_du::f1u_appconfig f1u_cfg;
6565
/// Buffer pool configuration.
66-
buffer_pool_appconfig buffer_pool_config;
66+
app_services::buffer_pool_appconfig buffer_pool_config;
6767
/// Expert configuration.
6868
expert_execution_appconfig expert_execution_cfg;
6969
/// HAL configuration.

apps/du/du_appconfig_yaml_writer.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
1515
#include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
1616
#include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
17+
#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
1718
#include "apps/services/metrics/metrics_config_yaml_writer.h"
1819
#include "du_appconfig.h"
1920

@@ -41,21 +42,18 @@ static void fill_du_appconfig_expert_execution_section(YAML::Node node, const ex
4142
}
4243

4344
{
44-
YAML::Node threads_node = node["threads"];
45-
YAML::Node main_node = threads_node["main_pool"];
45+
YAML::Node threads_node = node["threads"];
46+
YAML::Node main_pool_node = threads_node["main_pool"];
4647
if (config.threads.main_pool.nof_threads.has_value()) {
47-
main_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
48+
main_pool_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
49+
} else {
50+
main_pool_node["nof_threads"] = "auto";
4851
}
49-
main_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
52+
main_pool_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
53+
main_pool_node["backoff_period"] = config.threads.main_pool.backoff_period;
5054
}
5155
}
5256

53-
static void fill_du_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
54-
{
55-
node["nof_segments"] = config.nof_segments;
56-
node["segment_size"] = config.segment_size;
57-
}
58-
5957
static void fill_du_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
6058
{
6159
node["enabled"] = config.enabled;
@@ -80,11 +78,12 @@ void srsran::fill_du_appconfig_in_yaml_schema(YAML::Node& node, const du_appconf
8078
app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
8179
app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
8280
app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
81+
node["metrics"]["autostart_stdout_metrics"] = config.metrics_cfg.autostart_stdout_metrics;
82+
app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
8383
fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
8484
fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
8585
fill_du_appconfig_hal_section(node, config.hal_config);
8686
fill_du_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
87-
fill_du_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
8887
fill_du_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
8988
fill_du_appconfig_f1u_section(node["f1u"], config.f1u_cfg);
9089
fill_du_appconfig_f1ap_section(node["f1ap"], config.f1ap_cfg);

apps/du_low/du_low_appconfig_yaml_writer.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,15 @@ static void fill_du_appconfig_expert_execution_section(YAML::Node node, const ex
3131
}
3232

3333
{
34-
YAML::Node threads_node = node["threads"];
35-
YAML::Node main_pool_node = threads_node["main_pool"];
36-
main_pool_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
34+
YAML::Node threads_node = node["threads"];
35+
YAML::Node main_pool_node = threads_node["main_pool"];
36+
if (config.threads.main_pool.nof_threads.has_value()) {
37+
main_pool_node["nof_threads"] = config.threads.main_pool.nof_threads.value();
38+
} else {
39+
main_pool_node["nof_threads"] = "auto";
40+
}
3741
main_pool_node["task_queue_size"] = config.threads.main_pool.task_queue_size;
42+
main_pool_node["backoff_period"] = config.threads.main_pool.backoff_period;
3843
}
3944
}
4045

apps/gnb/gnb_appconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct gnb_appconfig {
5151
/// Node name.
5252
std::string ran_node_name = "srsgnb01";
5353
/// Buffer pool configuration.
54-
buffer_pool_appconfig buffer_pool_config;
54+
app_services::buffer_pool_appconfig buffer_pool_config;
5555
/// Expert configuration.
5656
expert_execution_appconfig expert_execution_cfg;
5757
/// HAL configuration.

apps/gnb/gnb_appconfig_yaml_writer.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "apps/helpers/tracing/tracer_appconfig_yaml_writer.h"
1414
#include "apps/services/app_execution_metrics/executor_metrics_config_yaml_writer.h"
1515
#include "apps/services/app_resource_usage/app_resource_usage_config_yaml_writer.h"
16+
#include "apps/services/buffer_pool/buffer_pool_config_yaml_writer.h"
1617
#include "apps/services/metrics/metrics_config_yaml_writer.h"
1718
#include "gnb_appconfig.h"
1819

@@ -52,12 +53,6 @@ static void fill_gnb_appconfig_expert_execution_section(YAML::Node node, const e
5253
}
5354
}
5455

55-
static void fill_gnb_appconfig_buffer_pool_section(YAML::Node node, const buffer_pool_appconfig& config)
56-
{
57-
node["nof_segments"] = config.nof_segments;
58-
node["segment_size"] = config.segment_size;
59-
}
60-
6156
static void fill_gnb_appconfig_remote_control_section(YAML::Node node, const remote_control_appconfig& config)
6257
{
6358
node["enabled"] = config.enabled;
@@ -74,10 +69,11 @@ void srsran::fill_gnb_appconfig_in_yaml_schema(YAML::Node& node, const gnb_appco
7469
app_services::fill_app_resource_usage_config_in_yaml_schema(node, config.metrics_cfg.rusage_config);
7570
app_services::fill_metrics_appconfig_in_yaml_schema(node, config.metrics_cfg.metrics_service_cfg);
7671
app_services::fill_app_exec_metrics_config_in_yaml_schema(node, config.metrics_cfg.executors_metrics_cfg);
72+
node["metrics"]["autostart_stdout_metrics"] = config.metrics_cfg.autostart_stdout_metrics;
73+
app_services::fill_buffer_pool_config_in_yaml_schema(node, config.buffer_pool_config);
7774
fill_logger_appconfig_in_yaml_schema(node, config.log_cfg);
7875
fill_tracer_appconfig_in_yaml_schema(node, config.trace_cfg);
7976
fill_gnb_appconfig_hal_section(node, config.hal_config);
8077
fill_gnb_appconfig_expert_execution_section(node["expert_execution"], config.expert_execution_cfg);
81-
fill_gnb_appconfig_buffer_pool_section(node["buffer_pool"], config.buffer_pool_config);
8278
fill_gnb_appconfig_remote_control_section(node["remote_control"], config.remote_control_config);
8379
}

apps/helpers/e2/e2_config_yaml_writer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ void srsran::fill_e2_config_in_yaml_schema(YAML::Node node, const e2_config& con
2525
node["sctp_max_init_timeo"] = config.sctp_max_init_timeo;
2626
node["e2sm_kpm_enabled"] = config.e2sm_kpm_enabled;
2727
node["e2sm_rc_enabled"] = config.e2sm_rc_enabled;
28+
node["e2sm_ccc_enabled"] = config.e2sm_ccc_enabled;
2829
}

0 commit comments

Comments
 (0)