diff --git a/lib/src/rlc/rlc_am_nr.cc b/lib/src/rlc/rlc_am_nr.cc index 7e5647804..519a4157e 100644 --- a/lib/src/rlc/rlc_am_nr.cc +++ b/lib/src/rlc/rlc_am_nr.cc @@ -1273,6 +1273,7 @@ uint32_t rlc_am_nr_rx::get_status_pdu(rlc_am_nr_status_pdu_t* status, uint32_t m if (segm->header.so != last_so) { // Some bytes were not received status->nacks[status->N_nack].nack_sn = i; + status->nacks[status->N_nack].has_so = true; status->nacks[status->N_nack].so_start = last_so; status->nacks[status->N_nack].so_end = segm->header.so; status->N_nack++; @@ -1284,6 +1285,7 @@ uint32_t rlc_am_nr_rx::get_status_pdu(rlc_am_nr_status_pdu_t* status, uint32_t m } if (not last_segment_rx) { status->nacks[status->N_nack].nack_sn = i; + status->nacks[status->N_nack].has_so = true; status->nacks[status->N_nack].so_start = last_so; status->nacks[status->N_nack].so_end = so_end_of_sdu; status->N_nack++; diff --git a/lib/src/rlc/rlc_am_nr_packing.cc b/lib/src/rlc/rlc_am_nr_packing.cc index 709310245..031aaa406 100644 --- a/lib/src/rlc/rlc_am_nr_packing.cc +++ b/lib/src/rlc/rlc_am_nr_packing.cc @@ -200,6 +200,7 @@ uint32_t rlc_am_nr_read_status_pdu(const uint8_t* payload, ptr++; if (e2 != 0) { + status->nacks[status->N_nack].has_so = true; status->nacks[status->N_nack].so_start = (*ptr) << 8; ptr++; status->nacks[status->N_nack].so_start |= (*ptr); @@ -244,7 +245,7 @@ int32_t rlc_am_nr_write_status_pdu(const rlc_am_nr_status_pdu_t& status_pdu, if (status_pdu.N_nack > 0) { for (uint32_t i = 0; i < status_pdu.N_nack; i++) { - if (status_pdu.nacks[i].so_start != 0 || status_pdu.nacks[i].so_end != 0) { + if (status_pdu.nacks[i].has_so) { // write first 8 bit of NACK_SN *ptr = (status_pdu.nacks[i].nack_sn >> 4) & 0xff; ptr++; diff --git a/lib/test/rlc/rlc_am_nr_pdu_test.cc b/lib/test/rlc/rlc_am_nr_pdu_test.cc index dff22f9d4..2b456e0a4 100644 --- a/lib/test/rlc/rlc_am_nr_pdu_test.cc +++ b/lib/test/rlc/rlc_am_nr_pdu_test.cc @@ -287,6 +287,7 @@ int rlc_am_nr_control_pdu_test2() // E1 and E2 bit set on first NACK, only E2 on second. int rlc_am_nr_control_pdu_test3() { + test_delimit_logger delimiter("Control PDU test 3"); const int len = 15; std::array tv = { 0x08, 0x11, 0x80, 0x11, 0x1c, 0x00, 0x02, 0x00, 0x05, 0x11, 0x34, 0x00, 0x05, 0xFF, 0xFF}; diff --git a/lib/test/rlc/rlc_am_nr_test.cc b/lib/test/rlc/rlc_am_nr_test.cc index d8518a800..ebb9b5ae0 100644 --- a/lib/test/rlc/rlc_am_nr_test.cc +++ b/lib/test/rlc/rlc_am_nr_test.cc @@ -684,11 +684,11 @@ int retx_segment_test() // t-reassembly has expired. There should be a NACK in the status report. // There should be 3 NACKs with SO_start and SO_end - TESTASSERT(20 == rlc2.get_buffer_state()); // 2 bytes for ACK + 3 * 6 for NACK with SO = 20. + TESTASSERT(21 == rlc2.get_buffer_state()); // 3 bytes for fixed header (ACK+E1) + 3 * 6 for NACK with SO = 21. { // Read status PDU from RLC2 byte_buffer_t status_buf; - int len = rlc2.read_pdu(status_buf.msg, 20); + int len = rlc2.read_pdu(status_buf.msg, 21); status_buf.N_bytes = len; TESTASSERT(0 == rlc2.get_buffer_state()); @@ -696,9 +696,20 @@ int retx_segment_test() // Assert status is correct rlc_am_nr_status_pdu_t status_check = {}; rlc_am_nr_read_status_pdu(&status_buf, rlc_am_nr_sn_size_t::size12bits, &status_check); - TESTASSERT(status_check.ack_sn == 5); // 5 is the next expected SN. - TESTASSERT(status_check.N_nack == 3); // We lost one PDU. - TESTASSERT(status_check.nacks[0].nack_sn == 3); // Lost PDU SN=3. + TESTASSERT(status_check.ack_sn == 5); // 5 is the next expected SN. + TESTASSERT(status_check.N_nack == 3); // We lost one PDU. + TESTASSERT(status_check.nacks[0].nack_sn == 1); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[0].has_so == true); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[0].so_start == 0); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[0].so_end == 1); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[1].nack_sn == 2); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[1].has_so == true); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[1].so_start == 1); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[1].so_end == 2); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[2].nack_sn == 3); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[2].has_so == true); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[2].so_start == 2); // Lost SDU on SN=1. + TESTASSERT(status_check.nacks[2].so_end == 0xFFFF); // Lost SDU on SN=1. // Write status PDU to RLC1 rlc1.write_pdu(status_buf.msg, status_buf.N_bytes); @@ -706,9 +717,9 @@ int retx_segment_test() // Check there is an Retx of SN=3 TESTASSERT(5 == rlc1.get_buffer_state()); } - /* + { - // Re-transmit PDU in 3 segments + // Re-transmit the 3 lost segments for (int i = 0; i < 3; i++) { byte_buffer_t retx_buf; uint32_t len = 0; @@ -724,12 +735,14 @@ int retx_segment_test() rlc_am_nr_pdu_header_t header_check = {}; uint32_t hdr_len = rlc_am_nr_read_data_pdu_header(&retx_buf, rlc_am_nr_sn_size_t::size12bits, &header_check); // Double check header. - TESTASSERT(header_check.sn == 3); // Double check RETX SN if (i == 0) { + TESTASSERT(header_check.sn == 1); // Double check RETX SN TESTASSERT(header_check.si == rlc_nr_si_field_t::first_segment); } else if (i == 1) { + TESTASSERT(header_check.sn == 2); // Double check RETX SN TESTASSERT(header_check.si == rlc_nr_si_field_t::neither_first_nor_last_segment); } else { + TESTASSERT(header_check.sn == 3); // Double check RETX SN TESTASSERT(header_check.si == rlc_nr_si_field_t::last_segment); } @@ -737,43 +750,43 @@ int retx_segment_test() } TESTASSERT(0 == rlc1.get_buffer_state()); } + /* + // Check statistics + rlc_bearer_metrics_t metrics1 = rlc1.get_metrics(); + rlc_bearer_metrics_t metrics2 = rlc2.get_metrics(); - // Check statistics - rlc_bearer_metrics_t metrics1 = rlc1.get_metrics(); - rlc_bearer_metrics_t metrics2 = rlc2.get_metrics(); + // SDU metrics + TESTASSERT_EQ(5, metrics1.num_tx_sdus); + TESTASSERT_EQ(0, metrics1.num_rx_sdus); + TESTASSERT_EQ(15, metrics1.num_tx_sdu_bytes); + TESTASSERT_EQ(0, metrics1.num_rx_sdu_bytes); + TESTASSERT_EQ(0, metrics1.num_lost_sdus); + // PDU metrics + TESTASSERT_EQ(5 + 3, metrics1.num_tx_pdus); // 3 re-transmissions + TESTASSERT_EQ(2, metrics1.num_rx_pdus); // Two status PDU + TESTASSERT_EQ(38, metrics1.num_tx_pdu_bytes); // 2 Bytes * NBUFFS (header size) + NBUFFS * 3 (data) + + // 3 (1 retx no SO) + 2 * 5 (2 retx with SO) = 38 + TESTASSERT_EQ(3 + 5, metrics1.num_rx_pdu_bytes); // Two status PDU (one with a NACK) + TESTASSERT_EQ(0, metrics1.num_lost_sdus); // No lost SDUs - // SDU metrics - TESTASSERT_EQ(5, metrics1.num_tx_sdus); - TESTASSERT_EQ(0, metrics1.num_rx_sdus); - TESTASSERT_EQ(15, metrics1.num_tx_sdu_bytes); - TESTASSERT_EQ(0, metrics1.num_rx_sdu_bytes); - TESTASSERT_EQ(0, metrics1.num_lost_sdus); - // PDU metrics - TESTASSERT_EQ(5 + 3, metrics1.num_tx_pdus); // 3 re-transmissions - TESTASSERT_EQ(2, metrics1.num_rx_pdus); // Two status PDU - TESTASSERT_EQ(38, metrics1.num_tx_pdu_bytes); // 2 Bytes * NBUFFS (header size) + NBUFFS * 3 (data) + - // 3 (1 retx no SO) + 2 * 5 (2 retx with SO) = 38 - TESTASSERT_EQ(3 + 5, metrics1.num_rx_pdu_bytes); // Two status PDU (one with a NACK) - TESTASSERT_EQ(0, metrics1.num_lost_sdus); // No lost SDUs + // PDU metrics + TESTASSERT_EQ(0, metrics2.num_tx_sdus); + TESTASSERT_EQ(5, metrics2.num_rx_sdus); + TESTASSERT_EQ(0, metrics2.num_tx_sdu_bytes); + TESTASSERT_EQ(15, metrics2.num_rx_sdu_bytes); // 5 SDUs, 3 bytes each + TESTASSERT_EQ(0, metrics2.num_lost_sdus); + // SDU metrics + TESTASSERT_EQ(2, metrics2.num_tx_pdus); // Two status PDUs + TESTASSERT_EQ(7, metrics2.num_rx_pdus); // 7 PDUs (8 tx'ed, but one was lost) + TESTASSERT_EQ(5 + 3, metrics2.num_tx_pdu_bytes); // Two status PDU (one with a NACK) + TESTASSERT_EQ(33, metrics2.num_rx_pdu_bytes); // 2 Bytes * (NBUFFS-1) (header size) + (NBUFFS-1) * 3 (data) + // 3 (1 retx no SO) + 2 * 5 (2 retx with SO) = 33 + TESTASSERT_EQ(0, metrics2.num_lost_sdus); // No lost SDUs - // PDU metrics - TESTASSERT_EQ(0, metrics2.num_tx_sdus); - TESTASSERT_EQ(5, metrics2.num_rx_sdus); - TESTASSERT_EQ(0, metrics2.num_tx_sdu_bytes); - TESTASSERT_EQ(15, metrics2.num_rx_sdu_bytes); // 5 SDUs, 3 bytes each - TESTASSERT_EQ(0, metrics2.num_lost_sdus); - // SDU metrics - TESTASSERT_EQ(2, metrics2.num_tx_pdus); // Two status PDUs - TESTASSERT_EQ(7, metrics2.num_rx_pdus); // 7 PDUs (8 tx'ed, but one was lost) - TESTASSERT_EQ(5 + 3, metrics2.num_tx_pdu_bytes); // Two status PDU (one with a NACK) - TESTASSERT_EQ(33, metrics2.num_rx_pdu_bytes); // 2 Bytes * (NBUFFS-1) (header size) + (NBUFFS-1) * 3 (data) - // 3 (1 retx no SO) + 2 * 5 (2 retx with SO) = 33 - TESTASSERT_EQ(0, metrics2.num_lost_sdus); // No lost SDUs - - // Check state - rlc_am_nr_rx_state_t state2_rx = rx2->get_rx_state(); - TESTASSERT_EQ(5, state2_rx.rx_next); - */ + // Check state + rlc_am_nr_rx_state_t state2_rx = rx2->get_rx_state(); + TESTASSERT_EQ(5, state2_rx.rx_next); + */ return SRSRAN_SUCCESS; } @@ -801,7 +814,6 @@ int main() // start log back-end srslog::init(); - // TESTASSERT(window_checker_test() == SRSRAN_SUCCESS); // TESTASSERT(basic_test() == SRSRAN_SUCCESS); // TESTASSERT(lost_pdu_test() == SRSRAN_SUCCESS);