From cd036d87606da6dad626975fe69701c0f7bf99d9 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Tue, 11 Jun 2019 00:57:10 +0200 Subject: [PATCH] SRSUE: proc_ra.h/.cc use C++11 mutex --- srsue/hdr/stack/mac/proc_ra.h | 3 ++- srsue/src/stack/mac/proc_ra.cc | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/srsue/hdr/stack/mac/proc_ra.h b/srsue/hdr/stack/mac/proc_ra.h index 1e6dc5478..fd82198a4 100644 --- a/srsue/hdr/stack/mac/proc_ra.h +++ b/srsue/hdr/stack/mac/proc_ra.h @@ -22,6 +22,7 @@ #ifndef SRSUE_PROC_RA_H #define SRSUE_PROC_RA_H +#include #include #include "srslte/common/log.h" @@ -182,7 +183,7 @@ private: uint64_t transmitted_contention_id; uint16_t transmitted_crnti; - pthread_mutex_t mutex; + std::mutex mutex; enum { PDCCH_CRNTI_NOT_RECEIVED = 0, PDCCH_CRNTI_UL_GRANT, PDCCH_CRNTI_DL_GRANT } pdcch_to_crnti_received; diff --git a/srsue/src/stack/mac/proc_ra.cc b/srsue/src/stack/mac/proc_ra.cc index fc1d673bf..84443778f 100644 --- a/srsue/src/stack/mac/proc_ra.cc +++ b/srsue/src/stack/mac/proc_ra.cc @@ -63,13 +63,10 @@ void ra_proc::init(phy_interface_mac_lte* phy_h_, srslte_softbuffer_rx_init(&softbuffer_rar, 10); - pthread_mutex_init(&mutex, NULL); - reset(); } ra_proc::~ra_proc() { - pthread_mutex_destroy(&mutex); srslte_softbuffer_rx_free(&softbuffer_rar); } @@ -88,16 +85,15 @@ void ra_proc::start_pcap(srslte::mac_pcap* pcap_) void ra_proc::set_config(srsue::mac_interface_rrc::rach_cfg_t& rach_cfg) { - pthread_mutex_lock(&mutex); + std::unique_lock ul(mutex); new_cfg = rach_cfg; - pthread_mutex_unlock(&mutex); } void ra_proc::read_params() { - pthread_mutex_lock(&mutex); + mutex.lock(); rach_cfg = new_cfg; - pthread_mutex_unlock(&mutex); + mutex.unlock(); // Read initialization parameters if (noncontention_enabled) {