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

Fix a data race in rlc TM metrics.

This commit is contained in:
faluco 2021-09-23 18:23:35 +02:00 committed by Andre Puschmann
parent edb7342aef
commit 7b079fe289
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/include/srsran/rlc/rlc_tm.h
View File

@ -68,6 +68,7 @@ private:
std::atomic<bool> tx_enabled = {true};
std::mutex metrics_mutex;
rlc_bearer_metrics_t metrics = {};
// Thread-safe queues for MAC messages

6
lib/src/rlc/rlc_tm.cc
View File

@ -126,11 +126,13 @@ uint32_t rlc_tm::get_buffer_state()
rlc_bearer_metrics_t rlc_tm::get_metrics()
{
std::lock_guard<std::mutex> lock(metrics_mutex);
return metrics;
}
void rlc_tm::reset_metrics()
{
std::lock_guard<std::mutex> lock(metrics_mutex);
metrics = {};
}
@ -156,6 +158,7 @@ uint32_t rlc_tm::read_pdu(uint8_t* payload, uint32_t nof_bytes)
ul_queue.size(),
ul_queue.size_bytes());
std::lock_guard<std::mutex> lock(metrics_mutex);
metrics.num_tx_pdu_bytes += pdu_size;
return pdu_size;
} else {
@ -175,8 +178,11 @@ void rlc_tm::write_pdu(uint8_t* payload, uint32_t nof_bytes)
memcpy(buf->msg, payload, nof_bytes);
buf->N_bytes = nof_bytes;
buf->set_timestamp();
{
std::lock_guard<std::mutex> lock(metrics_mutex);
metrics.num_rx_pdu_bytes += nof_bytes;
metrics.num_rx_pdus++;
}
if (srsran::srb_to_lcid(srsran::lte_srb::srb0) == lcid) {
rrc->write_pdu(lcid, std::move(buf));
} else {