5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix data race in mux_nr::add_bsr_ce.

Browse Source
master
faluco 3 years ago committed by Andre Puschmann
parent b8171e493e
commit d7e8d6bf65
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

11
srsue/hdr/stack/mac_nr/mux_nr.h
Unescape Escape View File

@ -30,7 +30,7 @@ class mux_nr final : mux_base, public mux_interface_bsr_nr
public: public:
explicit mux_nr(mac_interface_mux_nr& mac_, srslog::basic_logger& logger); explicit mux_nr(mac_interface_mux_nr& mac_, srslog::basic_logger& logger);
~mux_nr(){}; ~mux_nr(){};
void reset(); void reset();
int32_t init(rlc_interface_mac* rlc_); int32_t init(rlc_interface_mac* rlc_);
void msg3_flush(); void msg3_flush();
@ -53,9 +53,9 @@ private:
// internal helper methods // internal helper methods
// ctor configured members // ctor configured members
mac_interface_mux_nr& mac; mac_interface_mux_nr& mac;
rlc_interface_mac* rlc = nullptr; rlc_interface_mac* rlc = nullptr;
srslog::basic_logger& logger; srslog::basic_logger& logger;
// Msg3 related // Msg3 related
srsran::unique_byte_buffer_t msg3_buff = nullptr; srsran::unique_byte_buffer_t msg3_buff = nullptr;
@ -69,7 +69,8 @@ private:
srsran::mac_sch_pdu_nr tx_pdu; /// single MAC PDU for packing srsran::mac_sch_pdu_nr tx_pdu; /// single MAC PDU for packing
enum { no_bsr, sbsr_ce, lbsr_ce } add_bsr_ce = no_bsr; /// BSR procedure requests MUX to add a BSR CE enum bsr_req_t { no_bsr, sbsr_ce, lbsr_ce };
std::atomic<bsr_req_t> add_bsr_ce = {bsr_req_t::no_bsr}; /// BSR procedure requests MUX to add a BSR CE
// Mutex for exclusive access // Mutex for exclusive access
std::mutex mutex; std::mutex mutex;

Write Preview
Loading…
Cancel
Save