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

eMBMS,rlc: fixing deadlock by switching from write lock to read lock

Browse Source
master
yagoda 2 years ago committed by Justin Tallon
parent 6f95418689
commit cdd084adee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
srsenb/src/stack/mac/mac.cc
Unescape Escape View File

@ -133,11 +133,11 @@ int mac::rlc_buffer_state(uint16_t rnti, uint32_t lc_id, uint32_t tx_queue, uint
int ret = -1; int ret = -1;
if (check_ue_active(rnti)) { if (check_ue_active(rnti)) {
if (rnti != SRSRAN_MRNTI) { if (rnti != SRSRAN_MRNTI) {
srsran::rwlock_write_guard lock(rwlock); srsran::rwlock_read_guard lock(rwlock);
ret = scheduler.dl_rlc_buffer_state(rnti, lc_id, tx_queue, retx_queue); ret = scheduler.dl_rlc_buffer_state(rnti, lc_id, tx_queue, retx_queue);
} else { } else {
task_sched.defer_callback(0, [this, tx_queue, lc_id]() { task_sched.defer_callback(0, [this, tx_queue, lc_id]() {
srsran::rwlock_write_guard lock(rwlock); srsran::rwlock_read_guard lock(rwlock);
for (uint32_t i = 0; i < mch.num_mtch_sched; i++) { for (uint32_t i = 0; i < mch.num_mtch_sched; i++) {
if (lc_id == mch.mtch_sched[i].lcid) { if (lc_id == mch.mtch_sched[i].lcid) {
mch.mtch_sched[i].lcid_buffer_size = tx_queue; mch.mtch_sched[i].lcid_buffer_size = tx_queue;

Write Preview
Loading…
Cancel
Save