From edb7342aef59a5bd2b70d766c286af126f98cf3c Mon Sep 17 00:00:00 2001
From: faluco <borja.ferrer@softwareradiosystems.com>
Date: Thu, 23 Sep 2021 17:57:50 +0200
Subject: [PATCH] Fix data race in rlc UM metrics.

---
 lib/include/srsran/rlc/rlc_um_base.h |  1 +
 lib/src/rlc/rlc_um_base.cc           | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/include/srsran/rlc/rlc_um_base.h b/lib/include/srsran/rlc/rlc_um_base.h
index 05d0a0179..997857a8e 100644
--- a/lib/include/srsran/rlc/rlc_um_base.h
+++ b/lib/include/srsran/rlc/rlc_um_base.h
@@ -165,6 +165,7 @@ protected:
   bool tx_enabled = false;
   bool rx_enabled = false;
 
+  std::mutex           metrics_mutex;
   rlc_bearer_metrics_t metrics = {};
 };
 
diff --git a/lib/src/rlc/rlc_um_base.cc b/lib/src/rlc/rlc_um_base.cc
index 26ce85370..2be81a2c7 100644
--- a/lib/src/rlc/rlc_um_base.cc
+++ b/lib/src/rlc/rlc_um_base.cc
@@ -82,15 +82,18 @@ void rlc_um_base::write_sdu(unique_byte_buffer_t sdu)
 {
   if (not tx_enabled || not tx) {
     logger.debug("%s is currently deactivated. Dropping SDU (%d B)", rb_name.c_str(), sdu->N_bytes);
+    std::lock_guard<std::mutex> lock(metrics_mutex);
     metrics.num_lost_sdus++;
     return;
   }
 
   int sdu_bytes = sdu->N_bytes; //< Store SDU length for book-keeping
   if (tx->try_write_sdu(std::move(sdu)) == SRSRAN_SUCCESS) {
+    std::lock_guard<std::mutex> lock(metrics_mutex);
     metrics.num_tx_sdus++;
     metrics.num_tx_sdu_bytes += sdu_bytes;
   } else {
+    std::lock_guard<std::mutex> lock(metrics_mutex);
     metrics.num_lost_sdus++;
   }
 }
@@ -102,6 +105,7 @@ void rlc_um_base::discard_sdu(uint32_t discard_sn)
     return;
   }
   tx->discard_sdu(discard_sn);
+  std::lock_guard<std::mutex> lock(metrics_mutex);
   metrics.num_lost_sdus++;
 }
 
@@ -135,6 +139,7 @@ uint32_t rlc_um_base::read_pdu(uint8_t* payload, uint32_t nof_bytes)
   if (tx && tx_enabled) {
     uint32_t len = tx->build_data_pdu(payload, nof_bytes);
     if (len > 0) {
+      std::lock_guard<std::mutex> lock(metrics_mutex);
       metrics.num_tx_pdu_bytes += len;
       metrics.num_tx_pdus++;
     }
@@ -146,19 +151,24 @@ uint32_t rlc_um_base::read_pdu(uint8_t* payload, uint32_t nof_bytes)
 void rlc_um_base::write_pdu(uint8_t* payload, uint32_t nof_bytes)
 {
   if (rx && rx_enabled) {
-    metrics.num_rx_pdus++;
-    metrics.num_rx_pdu_bytes += nof_bytes;
+    {
+      std::lock_guard<std::mutex> lock(metrics_mutex);
+      metrics.num_rx_pdus++;
+      metrics.num_rx_pdu_bytes += nof_bytes;
+    }
     rx->handle_data_pdu(payload, nof_bytes);
   }
 }
 
 rlc_bearer_metrics_t rlc_um_base::get_metrics()
 {
+  std::lock_guard<std::mutex> lock(metrics_mutex);
   return metrics;
 }
 
 void rlc_um_base::reset_metrics()
 {
+  std::lock_guard<std::mutex> lock(metrics_mutex);
   metrics = {};
 }