From 00a60dbb97ab06b8cb6ec13852c33025408fd0e9 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 12 Jan 2022 17:31:13 +0000 Subject: [PATCH] lib,rlc: removed duplicate rb_name in logs of rlc_am_base and rlc_tm --- lib/src/rlc/rlc_am_base.cc | 11 +++++------ lib/src/rlc/rlc_tm.cc | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/src/rlc/rlc_am_base.cc b/lib/src/rlc/rlc_am_base.cc index 72f553283..c2f7978b0 100644 --- a/lib/src/rlc/rlc_am_base.cc +++ b/lib/src/rlc/rlc_am_base.cc @@ -90,14 +90,14 @@ bool rlc_am::configure(const rlc_config_t& cfg_) void rlc_am::stop() { - RlcDebug("Stopped bearer %s", rb_name.c_str()); + RlcDebug("Stopped bearer"); tx_base->stop(); rx_base->stop(); } void rlc_am::reestablish() { - RlcDebug("Reestablished bearer %s", rb_name.c_str()); + RlcDebug("Reestablished bearer"); tx_base->reestablish(); // calls stop and enables tx again rx_base->reestablish(); // calls only stop } @@ -221,13 +221,12 @@ int rlc_am::rlc_am_base_tx::write_sdu(unique_byte_buffer_t sdu) uint32_t nof_bytes = sdu->N_bytes; srsran::error_type ret = tx_sdu_queue.try_write(std::move(sdu)); if (ret) { - RlcHexInfo(msg_ptr, nof_bytes, "%s Tx SDU (%d B, tx_sdu_queue_len=%d)", rb_name, nof_bytes, tx_sdu_queue.size()); + RlcHexInfo(msg_ptr, nof_bytes, "Tx SDU (%d B, tx_sdu_queue_len=%d)", nof_bytes, tx_sdu_queue.size()); } else { // in case of fail, the try_write returns back the sdu RlcHexWarning(ret.error()->msg, ret.error()->N_bytes, - "[Dropped SDU] %s Tx SDU (%d B, tx_sdu_queue_len=%d)", - rb_name, + "[Dropped SDU] Tx SDU (%d B, tx_sdu_queue_len=%d)", ret.error()->N_bytes, tx_sdu_queue.size()); return SRSRAN_ERROR; @@ -248,7 +247,7 @@ void rlc_am::rlc_am_base_tx::set_bsr_callback(bsr_callback_t callback) *******************************************************/ void rlc_am::rlc_am_base_rx::write_pdu(uint8_t* payload, const uint32_t nof_bytes) { - RlcInfo("Rx PDU -- N bytes %d", nof_bytes); + RlcInfo("Rx PDU - N bytes %d", nof_bytes); if (nof_bytes < 1) { return; } diff --git a/lib/src/rlc/rlc_tm.cc b/lib/src/rlc/rlc_tm.cc index e5981adbc..cf2941544 100644 --- a/lib/src/rlc/rlc_tm.cc +++ b/lib/src/rlc/rlc_tm.cc @@ -85,8 +85,7 @@ void rlc_tm::write_sdu(unique_byte_buffer_t sdu) } else { RlcHexWarning(ret.error()->msg, ret.error()->N_bytes, - "[Dropped SDU] %s Tx SDU, queue size=%d, bytes=%d", - rrc->get_rb_name(lcid), + "[Dropped SDU] Tx SDU, queue size=%d, bytes=%d", ul_queue.size(), ul_queue.size_bytes()); }