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

fix stopping of RLC_AM timer and protect access

This commit is contained in:
Andre Puschmann 2018-09-07 13:10:22 +02:00
parent f3eceab242
commit 02e38c7c9f
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/src/upper/rlc_am.cc
View File

@ -235,11 +235,22 @@ bool rlc_am::rlc_am_tx::configure(srslte_rlc_am_config_t cfg_)
void rlc_am::rlc_am_tx::stop() void rlc_am::rlc_am_tx::stop()
{ {
empty_queue(); empty_queue();
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
if (parent->mac_timers && poll_retx_timer) {
poll_retx_timer->stop();
parent->mac_timers->timer_release_id(poll_retx_timer_id);
poll_retx_timer = NULL;
}
if (parent->mac_timers && status_prohibit_timer) {
status_prohibit_timer->stop();
parent->mac_timers->timer_release_id(status_prohibit_timer_id);
status_prohibit_timer = NULL;
}
vt_a = 0; vt_a = 0;
vt_ms = RLC_AM_WINDOW_SIZE; vt_ms = RLC_AM_WINDOW_SIZE;
vt_s = 0; vt_s = 0;
@ -474,7 +485,7 @@ unlock_and_exit:
void rlc_am::rlc_am_tx::timer_expired(uint32_t timeout_id) void rlc_am::rlc_am_tx::timer_expired(uint32_t timeout_id)
{ {
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
if (poll_retx_timer_id == timeout_id) { if (poll_retx_timer && poll_retx_timer_id == timeout_id) {
// if both tx and retx buffer are empty, retransmit next PDU to be ack'ed (Section 5.2.2.3 in TS 36.322) // if both tx and retx buffer are empty, retransmit next PDU to be ack'ed (Section 5.2.2.3 in TS 36.322)
log->debug("Poll reTx timer expired (lcid=%d)\n", parent->lcid); log->debug("Poll reTx timer expired (lcid=%d)\n", parent->lcid);
if ((tx_window.size() > 0 && retx_queue.size() == 0 && tx_sdu_queue.size() == 0)) { if ((tx_window.size() > 0 && retx_queue.size() == 0 && tx_sdu_queue.size() == 0)) {
@ -492,7 +503,7 @@ void rlc_am::rlc_am_tx::timer_expired(uint32_t timeout_id)
} }
} }
} else } else
if (status_prohibit_timer_id == timeout_id) { if (status_prohibit_timer && status_prohibit_timer_id == timeout_id) {
status_prohibited = true; status_prohibited = true;
status_prohibit_timer->reset(); status_prohibit_timer->reset();
} }
@ -525,12 +536,14 @@ bool rlc_am::rlc_am_tx::poll_required()
return true; return true;
} }
if (poll_retx_timer->is_expired()) { if (poll_retx_timer) {
// re-arm timer if (poll_retx_timer->is_expired()) {
poll_retx_timer->reset(); // re-arm timer
poll_retx_timer->set(this, cfg.t_poll_retx); poll_retx_timer->reset();
poll_retx_timer->run(); poll_retx_timer->set(this, cfg.t_poll_retx);
return true; poll_retx_timer->run();
return true;
}
} }
if (tx_sdu_queue.size() == 0 && retx_queue.size() == 0) { if (tx_sdu_queue.size() == 0 && retx_queue.size() == 0) {
@ -1205,7 +1218,12 @@ void rlc_am::rlc_am_rx::reestablish()
void rlc_am::rlc_am_rx::stop() void rlc_am::rlc_am_rx::stop()
{ {
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
reordering_timer->reset();
if (parent->mac_timers && reordering_timer) {
reordering_timer->stop();
parent->mac_timers->timer_release_id(reordering_timer_id);
reordering_timer = NULL;
}
if (rx_sdu) { if (rx_sdu) {
pool->deallocate(rx_sdu); pool->deallocate(rx_sdu);
@ -1584,7 +1602,7 @@ void rlc_am::rlc_am_rx::write_pdu(uint8_t *payload, uint32_t nof_bytes)
void rlc_am::rlc_am_rx::timer_expired(uint32_t timeout_id) void rlc_am::rlc_am_rx::timer_expired(uint32_t timeout_id)
{ {
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
if (reordering_timer_id == timeout_id) { if (reordering_timer && reordering_timer_id == timeout_id) {
reordering_timer->reset(); reordering_timer->reset();
log->debug("%s reordering timeout expiry - updating vr_ms\n", RB_NAME); log->debug("%s reordering timeout expiry - updating vr_ms\n", RB_NAME);