From 859f4d2185ee50f4bfc64c7ff33cf3f19eff4c94 Mon Sep 17 00:00:00 2001 From: Francisco Date: Tue, 19 Oct 2021 15:02:38 +0100 Subject: [PATCH] nr,gnb,sched: avoid logging warning for pending feedback of UEs that were just removed --- srsenb/src/stack/mac/nr/sched_nr.cc | 9 ++++++++- srsenb/src/stack/mac/nr/sched_nr_worker.cc | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/srsenb/src/stack/mac/nr/sched_nr.cc b/srsenb/src/stack/mac/nr/sched_nr.cc index b0acfabf4..89cbff2b0 100644 --- a/srsenb/src/stack/mac/nr/sched_nr.cc +++ b/srsenb/src/stack/mac/nr/sched_nr.cc @@ -101,7 +101,14 @@ void sched_nr::ue_cfg(uint16_t rnti, const ue_cfg_t& uecfg) void sched_nr::ue_rem(uint16_t rnti) { - sched_workers->enqueue_event(rnti, [this, rnti]() { ue_db.erase(rnti); }); + sched_workers->enqueue_event(rnti, [this, rnti]() { + auto ue_it = ue_db.find(rnti); + if (ue_it == ue_db.end()) { + logger->warning("SCHED: ue_rem(rnti) called for inexistent rnti=0x%x", rnti); + return; + } + ue_db.erase(rnti); + }); } bool sched_nr::ue_exists(uint16_t rnti) diff --git a/srsenb/src/stack/mac/nr/sched_nr_worker.cc b/srsenb/src/stack/mac/nr/sched_nr_worker.cc index ce992962c..97be29928 100644 --- a/srsenb/src/stack/mac/nr/sched_nr_worker.cc +++ b/srsenb/src/stack/mac/nr/sched_nr_worker.cc @@ -57,7 +57,7 @@ void slot_cc_worker::run_feedback(ue_map_t& ue_db) if (ue_db.contains(f.rnti) and ue_db[f.rnti]->carriers[cfg.cc] != nullptr) { f.fdbk(*ue_db[f.rnti]->carriers[cfg.cc]); } else { - logger.warning("SCHED: feedback received for invalid rnti=0x%x, cc=%d", f.rnti, cfg.cc); + logger.info("SCHED: feedback received for rnti=0x%x, cc=%d that has been removed.", f.rnti, cfg.cc); } } tmp_feedback_to_run.clear();