From 8d2197e751a8ce2d06f2445884f3a8c98e7ceaa8 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Wed, 17 Mar 2021 15:20:54 +0100 Subject: [PATCH] Increase MAC UE circular buffer --- srsenb/hdr/stack/mac/ue.h | 2 +- srsenb/src/stack/mac/ue.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srsenb/hdr/stack/mac/ue.h b/srsenb/hdr/stack/mac/ue.h index 648a5cf38..f073d0ac1 100644 --- a/srsenb/hdr/stack/mac/ue.h +++ b/srsenb/hdr/stack/mac/ue.h @@ -59,7 +59,7 @@ private: srslog::basic_logger* logger; srslte::pdu_queue* shared_pdu_queue; - srslte::circular_array, SRSLTE_FDD_NOF_HARQ * 2> pdu_map; + srslte::circular_array, SRSLTE_FDD_NOF_HARQ * 8> pdu_map; }; class cc_buffer_handler diff --git a/srsenb/src/stack/mac/ue.cc b/srsenb/src/stack/mac/ue.cc index 4d53de2e0..9f9d4ac3f 100644 --- a/srsenb/src/stack/mac/ue.cc +++ b/srsenb/src/stack/mac/ue.cc @@ -275,6 +275,7 @@ uint8_t* ue::request_buffer(uint32_t tti, uint32_t ue_cc_idx, const uint32_t len uint8_t* pdu = nullptr; if (len > 0) { pdu = cc_buffers[ue_cc_idx].get_rx_used_buffers().request_pdu(tti_point(tti), len); + logger.info("request_buffer: allocated for rnti=0x%x, tti=%d", rnti, tti); } else { logger.error("UE buffers: Requesting buffer for zero bytes"); } @@ -423,9 +424,9 @@ void ue::deallocate_pdu(uint32_t tti, uint32_t ue_cc_idx) { std::unique_lock lock(rx_buffers_mutex); if (not cc_buffers[ue_cc_idx].get_rx_used_buffers().try_deallocate_pdu(tti_point(tti))) { - logger.warning("UE buffers: Null RX PDU pointer in deallocate_pdu for rnti=0x%x pid=%d cc_idx=%d", + logger.warning("UE buffers: Null RX PDU pointer in deallocate_pdu for rnti=0x%x tti=%d cc_idx=%d", rnti, - tti % nof_rx_harq_proc, + tti, ue_cc_idx); } } @@ -435,7 +436,7 @@ void ue::push_pdu(uint32_t tti, uint32_t ue_cc_idx, uint32_t len) std::unique_lock lock(rx_buffers_mutex); if (not cc_buffers[ue_cc_idx].get_rx_used_buffers().push_pdu(tti_point(tti), len)) { logger.warning( - "UE buffers: Failed to push RX PDU for rnti=0x%x pid=%d cc_idx=%d", rnti, tti % nof_rx_harq_proc, ue_cc_idx); + "UE buffers: Failed to push RX PDU for rnti=0x%x tti=%d cc_idx=%d", rnti, tti, ue_cc_idx); } }