From a4932564d78ab73f099780e1d5ba9bb9e4dfc422 Mon Sep 17 00:00:00 2001 From: Carlo Galiotto Date: Tue, 19 Oct 2021 13:33:07 +0200 Subject: [PATCH] stdout: remove extra value from eNB stats + ... address PR review - change "TO DO" into "TODO" - remove forgotten "printf" for debug Signed-off-by: Carlo Galiotto --- srsenb/hdr/stack/mac/nr/ue_nr.h | 2 +- srsenb/src/metrics_stdout.cc | 3 +-- srsenb/src/stack/mac/nr/mac_nr.cc | 2 +- srsenb/src/stack/mac/nr/ue_nr.cc | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/srsenb/hdr/stack/mac/nr/ue_nr.h b/srsenb/hdr/stack/mac/nr/ue_nr.h index 4fc6259a8..4d63c5cf8 100644 --- a/srsenb/hdr/stack/mac/nr/ue_nr.h +++ b/srsenb/hdr/stack/mac/nr/ue_nr.h @@ -85,7 +85,7 @@ private: std::atomic active_state{true}; - // TO DO: some counters are kept as members of class ue_nr, while some others (i.e., mcs) are kept in the ue_metrics + // TODO: some counters are kept as members of class ue_nr, while some others (i.e., mcs) are kept in the ue_metrics // We should make these counters more uniform uint32_t phr_counter = 0; uint32_t dl_cqi_valid_counter = 0; diff --git a/srsenb/src/metrics_stdout.cc b/srsenb/src/metrics_stdout.cc index 06d6e63c1..2a1a213f2 100644 --- a/srsenb/src/metrics_stdout.cc +++ b/srsenb/src/metrics_stdout.cc @@ -139,9 +139,8 @@ void metrics_stdout::set_metrics_helper(uint32_t num_ue fmt::print(" {:>5.5}", "n/a"); } int phr = mac.ues[i].phr; - fmt::print(" {:>3}", int(phr)); if (not isnan(phr)) { - fmt::print(" {:>2}", int(phr)); + fmt::print(" {:>2}", phr); } else { fmt::print(" {:>2}", 0); } diff --git a/srsenb/src/stack/mac/nr/mac_nr.cc b/srsenb/src/stack/mac/nr/mac_nr.cc index 5a49f1649..8949a3331 100644 --- a/srsenb/src/stack/mac/nr/mac_nr.cc +++ b/srsenb/src/stack/mac/nr/mac_nr.cc @@ -81,7 +81,7 @@ void mac_nr::stop() /// However, get_metrics is called infrequently enough to cause major halts in the L1/L2 void mac_nr::get_metrics(srsenb::mac_metrics_t& metrics) { - // TO DO: We should comment on the logic we follow to get the metrics. Some of them are retrieved from MAC, some + // TODO: We should comment on the logic we follow to get the metrics. Some of them are retrieved from MAC, some // others from the scheduler. get_metrics_nolock(metrics); sched.get_metrics(metrics); diff --git a/srsenb/src/stack/mac/nr/ue_nr.cc b/srsenb/src/stack/mac/nr/ue_nr.cc index 261b49d00..904b5e97b 100644 --- a/srsenb/src/stack/mac/nr/ue_nr.cc +++ b/srsenb/src/stack/mac/nr/ue_nr.cc @@ -220,7 +220,6 @@ void ue_nr::metrics_read(mac_ue_metrics_t* metrics_) auto it = std::find(cc_list.begin(), cc_list.end(), 0); ue_metrics.cc_idx = std::distance(cc_list.begin(), it); - // printf("RNTI %u: reading and resetting metrics: \n", rnti); *metrics_ = ue_metrics; phr_counter = 0; dl_cqi_valid_counter = 0;