PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac: remove unused rwlock and unused cqi counter 

Signed-off-by: Carlo Galiotto <carlo@srs.io>
This commit is contained in:
Carlo Galiotto 2021-10-11 11:06:13 +02:00 committed by carlo-gal
parent f53e01cfa3
commit 1a52cdcdaa
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
srsenb/hdr/stack/mac/nr/ue_nr.h
View File

@ -84,7 +84,6 @@ private:
std::atomic<bool> 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;

1
srsenb/src/stack/mac/nr/mac_nr.cc
View File

@ -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;

13
srsenb/src/stack/mac/nr/ue_nr.cc
View File

@ -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++;
}
}