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

rlc, nr: cosmetic changes

This commit is contained in:
Robert Falkenberg 2022-02-28 06:04:16 +01:00
parent 0fb6420e8b
commit b55f8ea624
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/src/rlc/rlc_am_nr.cc
View File

@ -751,7 +751,7 @@ void rlc_am_nr_tx::handle_control_pdu(uint8_t* payload, uint32_t nof_bytes)
retx.so_end = segm->so + segm->payload_len;
retx_sn_set.insert(nack_sn);
RlcInfo(
"Schedule PDU segment SN=%d, so_start=%d, so_end=%d for retx", retx.sn, retx.so_start, retx.so_end);
"Scheduled RETX of SDU segment SN=%d, so_start=%d, so_end=%d", retx.sn, retx.so_start, retx.so_end);
}
}
} else {
@ -765,7 +765,7 @@ void rlc_am_nr_tx::handle_control_pdu(uint8_t* payload, uint32_t nof_bytes)
retx.current_so = 0;
retx.so_end = pdu.sdu_buf->N_bytes;
retx_sn_set.insert(nack_sn);
RlcInfo("Schedule PDU SN=%d for retx", retx.sn);
RlcInfo("Scheduled RETX of SDU SN=%d", retx.sn);
}
}
} // TX window containts NACK SN
@ -773,8 +773,8 @@ void rlc_am_nr_tx::handle_control_pdu(uint8_t* payload, uint32_t nof_bytes)
} // NACK loop
// Process retx_count and inform upper layers if needed
for (auto retx_sn_it = retx_sn_set.begin(); retx_sn_it != retx_sn_set.end(); retx_sn_it++) {
auto& pdu = tx_window[*retx_sn_it];
for (uint32_t retx_sn : retx_sn_set) {
auto& pdu = tx_window[retx_sn];
// Increment retx_count
if (pdu.retx_count == RETX_COUNT_NOT_STARTED) {
// Set retx_count = 0 on first RE-transmission of associated SDU (38.322 Sec. 5.3.2)
@ -785,7 +785,7 @@ void rlc_am_nr_tx::handle_control_pdu(uint8_t* payload, uint32_t nof_bytes)
}
// Inform upper layers if needed
check_sn_reached_max_retx(*retx_sn_it);
check_sn_reached_max_retx(retx_sn);
}
/**

2
lib/test/rlc/rlc_am_nr_test.cc
View File

@ -895,6 +895,7 @@ int max_retx_lost_sdu_test()
rlc_am rlc1(srsran_rat_t::nr, srslog::fetch_basic_logger("RLC_AM_1"), 1, &tester, &tester, &timers);
srslog::fetch_basic_logger("RLC_AM_1").set_hex_dump_max_size(100);
srslog::fetch_basic_logger("RLC").set_hex_dump_max_size(100);
test_delimit_logger delimiter("max retx lost SDU");
const rlc_config_t rlc_cfg = rlc_config_t::default_rlc_am_nr_config();
if (not rlc1.configure(rlc_cfg)) {
@ -964,6 +965,7 @@ int max_retx_lost_segments_test()
rlc_am rlc1(srsran_rat_t::nr, srslog::fetch_basic_logger("RLC_AM_1"), 1, &tester, &tester, &timers);
srslog::fetch_basic_logger("RLC_AM_1").set_hex_dump_max_size(100);
srslog::fetch_basic_logger("RLC").set_hex_dump_max_size(100);
test_delimit_logger delimiter("max retx lost SDU segment");
const rlc_config_t rlc_cfg = rlc_config_t::default_rlc_am_nr_config();
if (not rlc1.configure(rlc_cfg)) {