From 70d6e4d9b3c8abb1e0520de54808fe39b6c799c3 Mon Sep 17 00:00:00 2001
From: Francisco <francisco.paisana@softwareradiosystems.com>
Date: Tue, 27 Apr 2021 20:57:20 +0100
Subject: [PATCH] mac, fix - Verify that mac::ue also exists in the scheduler
 before attempting to retrieve its metrics

---
 srsenb/src/stack/mac/mac.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srsenb/src/stack/mac/mac.cc b/srsenb/src/stack/mac/mac.cc
index b3f5d3fcc..004ea61bf 100644
--- a/srsenb/src/stack/mac/mac.cc
+++ b/srsenb/src/stack/mac/mac.cc
@@ -274,11 +274,13 @@ int mac::cell_cfg(const std::vector<sched_interface::cell_cfg_t>& cell_cfg_)
 void mac::get_metrics(mac_metrics_t& metrics)
 {
   srsran::rwlock_read_guard lock(rwlock);
-  int                       cnt = 0;
-  metrics.ues.resize(ue_db.size());
+  metrics.ues.reserve(ue_db.size());
   for (auto& u : ue_db) {
-    u.second->metrics_read(&metrics.ues[cnt]);
-    cnt++;
+    if (not scheduler.ue_exists(u.first)) {
+      continue;
+    }
+    metrics.ues.emplace_back();
+    u.second->metrics_read(&metrics.ues.back());
   }
   metrics.cc_rach_counter = detected_rachs;
 }