From 1a52cdcdaae01e38ffffc20356b331240ab8049f Mon Sep 17 00:00:00 2001 From: Carlo Galiotto Date: Mon, 11 Oct 2021 11:06:13 +0200 Subject: [PATCH] mac: remove unused rwlock and unused cqi counter Signed-off-by: Carlo Galiotto --- srsenb/hdr/stack/mac/nr/ue_nr.h | 1 - srsenb/src/stack/mac/nr/mac_nr.cc | 1 - srsenb/src/stack/mac/nr/ue_nr.cc | 13 +++++-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/srsenb/hdr/stack/mac/nr/ue_nr.h b/srsenb/hdr/stack/mac/nr/ue_nr.h index 5f53dc52b..9200c12b3 100644 --- a/srsenb/hdr/stack/mac/nr/ue_nr.h +++ b/srsenb/hdr/stack/mac/nr/ue_nr.h @@ -84,7 +84,6 @@ private: std::atomic active_state{true}; uint32_t phr_counter = 0; - uint32_t dl_cqi_counter = 0; uint32_t dl_cqi_valid_counter = 0; uint32_t dl_ri_counter = 0; uint32_t dl_pmi_counter = 0; diff --git a/srsenb/src/stack/mac/nr/mac_nr.cc b/srsenb/src/stack/mac/nr/mac_nr.cc index 9ee998905..5860b5e75 100644 --- a/srsenb/src/stack/mac/nr/mac_nr.cc +++ b/srsenb/src/stack/mac/nr/mac_nr.cc @@ -367,7 +367,6 @@ bool mac_nr::handle_uci_data(const uint16_t rnti, const srsran_uci_cfg_nr_t& cfg } // Process CQI - srsran::rwlock_read_guard rw_lock(rwmutex); ue_db[rnti]->metrics_dl_cqi(cfg_, value.csi->wideband_cri_ri_pmi_cqi.cqi, value.valid); return true; diff --git a/srsenb/src/stack/mac/nr/ue_nr.cc b/srsenb/src/stack/mac/nr/ue_nr.cc index a4908ba3f..98c3788d4 100644 --- a/srsenb/src/stack/mac/nr/ue_nr.cc +++ b/srsenb/src/stack/mac/nr/ue_nr.cc @@ -188,10 +188,10 @@ 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); - *metrics_ = ue_metrics; - phr_counter = 0; - dl_cqi_counter = 0; - ue_metrics = {}; + *metrics_ = ue_metrics; + phr_counter = 0; + dl_cqi_valid_counter = 0; + ue_metrics = {}; } void ue_nr::metrics_dl_cqi(const srsran_uci_cfg_nr_t& cfg_, uint32_t dl_cqi, bool valid_cqi) @@ -200,9 +200,6 @@ void ue_nr::metrics_dl_cqi(const srsran_uci_cfg_nr_t& cfg_, uint32_t dl_cqi, boo // Process CQI for (uint32_t i = 0; i < cfg_.nof_csi; i++) { - // Increment CQI opportunity - dl_cqi_counter++; - // Skip if invalid or not supported CSI report if (not valid_cqi or cfg_.csi[i].cfg.quantity != SRSRAN_CSI_REPORT_QUANTITY_CRI_RI_PMI_CQI or cfg_.csi[i].cfg.freq_cfg != SRSRAN_CSI_REPORT_FREQ_WIDEBAND) { @@ -210,7 +207,7 @@ void ue_nr::metrics_dl_cqi(const srsran_uci_cfg_nr_t& cfg_, uint32_t dl_cqi, boo } // Add statistics - ue_metrics.dl_cqi = SRSRAN_VEC_SAFE_CMA(dl_cqi, ue_metrics.dl_cqi, dl_cqi_counter); + ue_metrics.dl_cqi = SRSRAN_VEC_SAFE_CMA(dl_cqi, ue_metrics.dl_cqi, dl_cqi_valid_counter); dl_cqi_valid_counter++; } }