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

Replaced PRIu32 for %u in pdcp_nr_entity

This commit is contained in:
Pedro Alvarez 2019-11-29 15:07:54 +00:00 committed by Andre Puschmann
parent e1cdd51eba
commit 41e911fd76
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/upper/pdcp_entity_nr.cc
View File

@ -110,7 +110,7 @@ void pdcp_entity_nr::write_sdu(unique_byte_buffer_t sdu, bool blocking)
discard_timer.set(static_cast<uint32_t>(cfg.discard_timer), discard_fnc);
discard_timer.run();
discard_timers_map.insert(std::make_pair(tx_next, std::move(discard_timer)));
log->debug("Discard Timer set for SN %" PRIu32 ". Timeout: %" PRIu32 "ms\n",
log->debug("Discard Timer set for SN %u. Timeout: %ums\n",
tx_next,
static_cast<uint32_t>(cfg.discard_timer));
}
@ -178,7 +178,7 @@ void pdcp_entity_nr::write_pdu(unique_byte_buffer_t pdu)
}
rcvd_count = COUNT(rcvd_hfn, rcvd_sn);
log->debug("RCVD_HFN %" PRIu32 " RCVD_SN %" PRIu32 ", RCVD_COUNT %" PRIu32 "\n", rcvd_hfn, rcvd_sn, rcvd_count);
log->debug("RCVD_HFN %u RCVD_SN %u, RCVD_COUNT %u\n", rcvd_hfn, rcvd_sn, rcvd_count);
// Decripting
cipher_decrypt(pdu->msg, pdu->N_bytes, rcvd_count, pdu->msg);
@ -192,7 +192,7 @@ void pdcp_entity_nr::write_pdu(unique_byte_buffer_t pdu)
// Check valid rcvd_count
if (rcvd_count < rx_deliv) {
log->debug("Out-of-order after time-out, duplicate or COUNT wrap-around\n");
log->debug("RCVD_COUNT %" PRIu32 ", RCVD_COUNT %" PRIu32 "\n", rcvd_count, rx_deliv);
log->debug("RCVD_COUNT %u, RCVD_COUNT %u\n", rcvd_count, rx_deliv);
return; // Invalid count, drop.
}
@ -320,7 +320,7 @@ void pdcp_entity_nr::deliver_all_consecutive_counts()
for (std::map<uint32_t, unique_byte_buffer_t>::iterator it = reorder_queue.begin();
it != reorder_queue.end() && it->first == rx_deliv;
reorder_queue.erase(it++)) {
log->debug("Delivering SDU with RCVD_COUNT %" PRIu32 "\n", it->first);
log->debug("Delivering SDU with RCVD_COUNT %u\n", it->first);
// Check RX_DELIV overflow
if (rx_overflow) {

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

@ -107,7 +107,7 @@ void rlc_um_base::write_sdu(unique_byte_buffer_t sdu, bool blocking)
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 %" PRIu32 ")\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);
metrics.num_dropped_sdus++;
return;
}

2
lib/test/upper/pdcp_nr_test.h
View File

@ -143,7 +143,7 @@ public:
}
void discard_sdu(uint32_t lcid, uint32_t discard_sn)
{
log->info("Notifing RLC to discard SDU (SN=%" PRIu32 ")\n", discard_sn);
log->info("Notifing RLC to discard SDU (SN=%u)\n", discard_sn);
discard_count++;
log->info("Discard_count=%" PRIu64 "\n", discard_count);
}