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

rlc: change remaining occurances of "SN: " to "SN="

Browse Source 
streamline all RLC AM and UM for better log analysis
master
Andre Puschmann 4 years ago
parent 137d250d66
commit 6fb01d61a7
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

16
lib/src/upper/rlc_am_lte.cc
Unescape Escape View File

@ -315,7 +315,7 @@ uint32_t rlc_am_lte::rlc_am_lte_tx::get_buffer_state()
// Bytes needed for retx
if (not retx_queue.empty()) {
rlc_amd_retx_t retx = retx_queue.front();
log->debug("%s Buffer state - retx - SN: %d, Segment: %s, %d:%d\n",
log->debug("%s Buffer state - retx - SN=%d, Segment: %s, %d:%d\n",
RB_NAME,
retx.sn,
retx.is_segment ? "true" : "false",
@ -627,7 +627,7 @@ int rlc_am_lte::rlc_am_lte_tx::build_retx_pdu(uint8_t* payload, uint32_t nof_byt
parent->rrc->max_retx_attempted();
}
log->info("%s Retx PDU scheduled for tx. SN: %d, retx count: %d\n", RB_NAME, retx.sn, tx_window[retx.sn].retx_count);
log->info("%s Retx PDU scheduled for tx. SN=%d, retx count: %d\n", RB_NAME, retx.sn, tx_window[retx.sn].retx_count);
debug_state();
return (ptr - payload) + tx_window[retx.sn].buf->N_bytes;
@ -816,7 +816,7 @@ int rlc_am_lte::rlc_am_lte_tx::build_data_pdu(uint8_t* payload, uint32_t nof_byt
log->console("retx_queue size: %zd PDUs\n", retx_queue.size());
std::map<uint32_t, rlc_amd_tx_pdu_t>::iterator txit;
for (txit = tx_window.begin(); txit != tx_window.end(); txit++) {
log->console("tx_window - SN: %d\n", txit->first);
log->console("tx_window - SN=%d\n", txit->first);
}
exit(-1);
#else
@ -1239,7 +1239,7 @@ void rlc_am_lte::rlc_am_lte_rx::handle_data_pdu(uint8_t* payload, uint32_t nof_b
log->info("%s Status packet requested through polling bit\n", RB_NAME);
do_status = true;
}
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n", RB_NAME, header.sn, vr_r, vr_mr);
log->info("%s SN=%d outside rx window [%d:%d] - discarding\n", RB_NAME, header.sn, vr_r, vr_mr);
return;
}
@ -1249,7 +1249,7 @@ void rlc_am_lte::rlc_am_lte_rx::handle_data_pdu(uint8_t* payload, uint32_t nof_b
log->info("%s Status packet requested through polling bit\n", RB_NAME);
do_status = true;
}
log->info("%s Discarding duplicate SN: %d\n", RB_NAME, header.sn);
log->info("%s Discarding duplicate SN=%d\n", RB_NAME, header.sn);
return;
}
@ -1268,7 +1268,7 @@ void rlc_am_lte::rlc_am_lte_rx::handle_data_pdu(uint8_t* payload, uint32_t nof_b
// check available space for payload
if (nof_bytes > pdu.buf->get_tailroom()) {
log->error("%s Discarding SN: %d of size %d B (available space %d B)\n",
log->error("%s Discarding SN=%d of size %d B (available space %d B)\n",
RB_NAME,
header.sn,
nof_bytes,
@ -1357,7 +1357,7 @@ void rlc_am_lte::rlc_am_lte_rx::handle_data_pdu_segment(uint8_t* pa
log->info("%s Status packet requested through polling bit\n", RB_NAME);
do_status = true;
}
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n", RB_NAME, header.sn, vr_r, vr_mr);
log->info("%s SN=%d outside rx window [%d:%d] - discarding\n", RB_NAME, header.sn, vr_r, vr_mr);
return;
}
@ -1719,7 +1719,7 @@ void rlc_am_lte::rlc_am_lte_rx::print_rx_segments()
for (it = rx_segments.begin(); it != rx_segments.end(); it++) {
std::list<rlc_amd_rx_pdu_t>::iterator segit;
for (segit = it->second.segments.begin(); segit != it->second.segments.end(); segit++) {
ss << " SN:" << segit->header.sn << " SO:" << segit->header.so << " N:" << segit->buf->N_bytes
ss << " SN=" << segit->header.sn << " SO:" << segit->header.so << " N:" << segit->buf->N_bytes
<< " N_li: " << segit->header.N_li << std::endl;
}
}

2
lib/src/upper/rlc_um_base.cc
Unescape Escape View File

@ -111,7 +111,7 @@ void rlc_um_base::write_sdu(unique_byte_buffer_t sdu)
void rlc_um_base::discard_sdu(uint32_t discard_sn)
{
if (not tx_enabled || not tx) {
log->debug("%s is currently deactivated. Ignoring SDU discard (SN %u)\n", rb_name.c_str(), discard_sn);
log->debug("%s is currently deactivated. Ignoring SDU discard (SN=%u)\n", rb_name.c_str(), discard_sn);
return;
}
tx->discard_sdu(discard_sn);

12
lib/src/upper/rlc_um_lte.cc
Unescape Escape View File

@ -292,17 +292,17 @@ void rlc_um_lte::rlc_um_lte_rx::handle_data_pdu(uint8_t* payload, uint32_t nof_b
{
rlc_umd_pdu_header_t header;
rlc_um_read_data_pdu_header(payload, nof_bytes, cfg.um.rx_sn_field_length, &header);
log->info_hex(payload, nof_bytes, "RX %s Rx data PDU SN: %d (%d B)", rb_name.c_str(), header.sn, nof_bytes);
log->info_hex(payload, nof_bytes, "RX %s Rx data PDU SN=%d (%d B)", rb_name.c_str(), header.sn, nof_bytes);
if (RX_MOD_BASE(header.sn) >= RX_MOD_BASE(vr_uh - cfg.um.rx_window_size) &&
RX_MOD_BASE(header.sn) < RX_MOD_BASE(vr_ur)) {
log->info("%s SN: %d outside rx window [%d:%d] - discarding\n", rb_name.c_str(), header.sn, vr_ur, vr_uh);
log->info("%s SN=%d outside rx window [%d:%d] - discarding\n", rb_name.c_str(), header.sn, vr_ur, vr_uh);
return;
}
std::map<uint32_t, rlc_umd_pdu_t>::iterator it = rx_window.find(header.sn);
if (rx_window.end() != it) {
log->info("%s Discarding duplicate SN: %d\n", rb_name.c_str(), header.sn);
log->info("%s Discarding duplicate SN=%d\n", rb_name.c_str(), header.sn);
return;
}
@ -489,10 +489,10 @@ void rlc_um_lte::rlc_um_lte_rx::reassemble_rx_sdus()
// Check if the first part of the PDU is a middle or end segment
if (rx_sdu->N_bytes == 0 && i == 0 && !rlc_um_start_aligned(rx_window[vr_ur].header.fi)) {
log->warning_hex(
rx_window[vr_ur].buf->msg, len, "Dropping first %d B of SN %d due to lost start segment\n", len, vr_ur);
rx_window[vr_ur].buf->msg, len, "Dropping first %d B of SN=%d due to lost start segment\n", len, vr_ur);
if (rx_window[vr_ur].buf->N_bytes < len) {
log->error("Dropping remaining remainder of SN %d too (N_bytes=%u < len=%d)\n",
log->error("Dropping remaining remainder of SN=%d too (N_bytes=%u < len=%d)\n",
vr_ur,
rx_window[vr_ur].buf->N_bytes,
len);
@ -673,7 +673,7 @@ void rlc_um_lte::rlc_um_lte_rx::timer_expired(uint32_t timeout_id)
// 36.322 v10 Section 5.1.2.2.4
log->info("%s reordering timeout expiry - updating vr_ur and reassembling\n", rb_name.c_str());
log->warning("Lost PDU SN: %d\n", vr_ur);
log->warning("Lost PDU SN=%d\n", vr_ur);
pdu_lost = true;
if (rx_sdu != NULL) {

Write Preview
Loading…
Cancel
Save