Skip to content

Commit a9bf001

Browse files
alvasMancodebot
alvasMan
authored and
codebot
committed
rlc: cosmetic changes in rlc metrics
* remove unused if clause * use static_cast instead of C-cast for floats * removed commas separating variable printing * fixup wrong metrics name in UM and added segment metrics in AM
1 parent 1bae17d commit a9bf001

File tree

4 files changed

+40
-27
lines changed

4 files changed

+40
-27
lines changed

‎apps/services/metrics_log_helper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void metrics_log_helper::report_metrics(const scheduler_cell_metrics& metrics)
6161
} else {
6262
fmt::format_to(buffer, " dl_error_rate={}%", 0);
6363
}
64-
fmt::format_to(buffer, " dl_bs={}", scaled_fmt_integer(ue.dl_bs, /*right_align=*/false));
64+
fmt::format_to(buffer, " dl_bs={}", scaled_fmt_integer(ue.dl_bs, false));
6565

6666
if (!std::isnan(ue.pusch_snr_db) && !iszero(ue.pusch_snr_db)) {
6767
fmt::format_to(buffer, " pusch_snr_db={:.1f}", std::clamp(ue.pusch_snr_db, -99.9f, 99.9f));
@@ -94,7 +94,7 @@ void metrics_log_helper::report_metrics(const scheduler_cell_metrics& metrics)
9494
} else {
9595
fmt::format_to(buffer, " ul_error_rate={}%", 0);
9696
}
97-
fmt::format_to(buffer, " bsr={}", scaled_fmt_integer(ue.bsr, /*right_align=*/false));
97+
fmt::format_to(buffer, " bsr={}", scaled_fmt_integer(ue.bsr, false));
9898
if (ue.last_ta.has_value()) {
9999
fmt::format_to(buffer, " last_ta={}s", float_to_eng_string(ue.last_ta->to_seconds<float>(), 0, false));
100100
} else {

‎apps/services/metrics_plotter_stdout.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void metrics_plotter_stdout::report_metrics(const scheduler_cell_metrics& metric
7070
} else {
7171
fmt::print(" {:>3}%", 0);
7272
}
73-
fmt::print(" {}", scaled_fmt_integer(ue.dl_bs, /*align_right=*/true));
73+
fmt::print(" {}", scaled_fmt_integer(ue.dl_bs, true));
7474

7575
fmt::print(" |");
7676

@@ -105,7 +105,7 @@ void metrics_plotter_stdout::report_metrics(const scheduler_cell_metrics& metric
105105
} else {
106106
fmt::print(" {:>3}%", 0);
107107
}
108-
fmt::print(" {}", scaled_fmt_integer(ue.bsr, /*align_right=*/true));
108+
fmt::print(" {}", scaled_fmt_integer(ue.bsr, true));
109109
if (ue.last_ta.has_value()) {
110110
fmt::print(" {}", float_to_eng_string(ue.last_ta->to_seconds<float>(), 0, true));
111111
} else {

‎include/srsran/rlc/rlc_rx_metrics.h‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,31 @@ inline std::string format_rlc_rx_metrics(timer_duration metrics_period, const rl
7878
fmt::format_to(buffer,
7979
"num_sdus={} sdu_rate={}bps num_pdus={} pdu_rate={}bps",
8080
scaled_fmt_integer(m.num_sdus, false),
81-
float_to_eng_string((double)m.num_sdu_bytes * 8 * 1000 / metrics_period.count(), 1, false),
81+
float_to_eng_string(static_cast<float>(m.num_sdu_bytes) * 8 * 1000 / metrics_period.count(), 1, false),
8282
scaled_fmt_integer(m.num_pdus, false),
8383
(double)m.num_pdu_bytes * 8 / (double)metrics_period.count());
84-
if (m.mode == rlc_mode::tm) {
85-
// No TM specific metrics for RX
86-
} else if ((m.mode == rlc_mode::um_bidir || m.mode == rlc_mode::um_unidir_ul)) {
84+
85+
// No TM specific metrics for RX
86+
if ((m.mode == rlc_mode::um_bidir || m.mode == rlc_mode::um_unidir_ul)) {
8787
// Format UM specific metrics for RX
88+
fmt::format_to(buffer,
89+
" num_sdu_segments={} sdu_segmments_rate={}bps",
90+
scaled_fmt_integer(m.mode_specific.um.num_sdu_segments, false),
91+
float_to_eng_string(static_cast<float>(m.mode_specific.um.num_sdu_segment_bytes) * 8 * 1000 /
92+
metrics_period.count(),
93+
1,
94+
false));
95+
} else if (m.mode == rlc_mode::am) {
8896
fmt::format_to(
8997
buffer,
90-
" ctrl_pdus={}, ctrl_rate={}bps",
91-
scaled_fmt_integer(m.mode_specific.um.num_sdu_segments, false),
92-
float_to_eng_string((double)m.mode_specific.um.num_sdu_segments * 8 * 1000 / metrics_period.count(), 1, false));
93-
} else if (m.mode == rlc_mode::am) {
94-
fmt::format_to(buffer,
95-
" ctrl_pdus={}, ctrl_rate={}bps",
96-
scaled_fmt_integer(m.mode_specific.am.num_ctrl_pdus, false),
97-
float_to_eng_string(
98-
(float)m.mode_specific.am.num_ctrl_pdu_bytes * 8 * 1000 / metrics_period.count(), 1, false));
98+
" num_sdu_segments={} sdu_segmments_rate={}bps",
99+
" ctrl_pdus={} ctrl_rate={}bps",
100+
scaled_fmt_integer(m.mode_specific.am.num_sdu_segments, false),
101+
float_to_eng_string(
102+
static_cast<float>(m.mode_specific.am.num_sdu_segment_bytes) * 8 * 1000 / metrics_period.count(), 1, false),
103+
scaled_fmt_integer(m.mode_specific.am.num_ctrl_pdus, false),
104+
float_to_eng_string(
105+
static_cast<float>(m.mode_specific.am.num_ctrl_pdu_bytes) * 8 * 1000 / metrics_period.count(), 1, false));
99106
}
100107
return to_c_str(buffer);
101108
}

‎include/srsran/rlc/rlc_tx_metrics.h‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,35 +83,41 @@ inline std::string format_rlc_tx_metrics(timer_duration metrics_period, const rl
8383
fmt::memory_buffer buffer;
8484
fmt::format_to(
8585
buffer,
86-
"num_sdus={} sdu_rate={}bps, dropped_sdus={} discarded_sdus={} "
86+
"num_sdus={} sdu_rate={}bps dropped_sdus={} discarded_sdus={} "
8787
"num_pdus_no_segm={} pdu_rate_no_segm={}bps",
8888
scaled_fmt_integer(m.num_sdus, false),
89-
float_to_eng_string((float)m.num_sdu_bytes * 8 * 1000 / (metrics_period.count()), 1, false),
89+
float_to_eng_string(static_cast<float>(m.num_sdu_bytes) * 8 * 1000 / (metrics_period.count()), 1, false),
9090
scaled_fmt_integer(m.num_dropped_sdus, false),
9191
scaled_fmt_integer(m.num_discarded_sdus, false),
9292
scaled_fmt_integer(m.num_pdus_no_segmentation, false),
93-
float_to_eng_string((float)m.num_pdu_bytes_no_segmentation * 8 * 1000 / metrics_period.count(), 1, false));
93+
float_to_eng_string(
94+
static_cast<float>(m.num_pdu_bytes_no_segmentation) * 8 * 1000 / metrics_period.count(), 1, false));
9495

9596
if (m.mode == rlc_mode::tm) {
9697
// No TM specific metrics for RX
9798
} else if ((m.mode == rlc_mode::um_bidir || m.mode == rlc_mode::um_unidir_dl)) {
9899
fmt::format_to(buffer,
99-
" num_pdus_with_segm={}, pdu_with_segm_rate={}bps",
100+
" num_pdus_with_segm={} pdu_with_segm_rate={}bps",
100101
m.mode_specific.um.num_pdus_with_segmentation,
101-
(double)m.mode_specific.um.num_pdu_bytes_with_segmentation * 8 / (double)metrics_period.count());
102+
static_cast<float>(m.mode_specific.um.num_pdu_bytes_with_segmentation) * 8 / metrics_period.count());
102103
} else if (m.mode == rlc_mode::am) {
103104
fmt::format_to(
104105
buffer,
105106
" num_pdus_with_segm={} pdu_rate_with_segm={}bps num_retx={} "
106107
"retx_rate={}bps ctrl_pdus={} ctrl_rate={}bps",
107108
scaled_fmt_integer(m.mode_specific.am.num_pdus_with_segmentation, false),
108-
float_to_eng_string(
109-
(float)m.mode_specific.am.num_pdu_bytes_with_segmentation * 8 * 1000 / metrics_period.count(), 1, false),
109+
float_to_eng_string(static_cast<float>(m.mode_specific.am.num_pdu_bytes_with_segmentation) * 8 * 1000 /
110+
metrics_period.count(),
111+
1,
112+
false),
110113
scaled_fmt_integer(m.mode_specific.am.num_retx_pdus, false),
111-
float_to_eng_string((float)m.mode_specific.am.num_retx_pdu_bytes * 8 * 1000 / metrics_period.count(), 1, false),
112-
scaled_fmt_integer(m.mode_specific.am.num_ctrl_pdus, false),
113114
float_to_eng_string(
114-
(float)m.mode_specific.am.num_ctrl_pdu_bytes * 8 * 1000 / (double)metrics_period.count(), 1, false));
115+
static_cast<float>(m.mode_specific.am.num_retx_pdu_bytes) * 8 * 1000 / metrics_period.count(), 1, false),
116+
scaled_fmt_integer(m.mode_specific.am.num_ctrl_pdus, false),
117+
float_to_eng_string(static_cast<float>(m.mode_specific.am.num_ctrl_pdu_bytes) * 8 * 1000 /
118+
(double)metrics_period.count(),
119+
1,
120+
false));
115121
}
116122
return to_c_str(buffer);
117123
}

0 commit comments

Comments
 (0)