From eb43c44dec09a8d9715e619fec857e721231a508 Mon Sep 17 00:00:00 2001 From: Giovanni Grieco Date: Tue, 19 Sep 2023 21:00:42 -0700 Subject: [PATCH] lte: add INFO messages at RRC, PDCP, RLC layers --- src/lte/model/lte-enb-rrc.cc | 3 +-- src/lte/model/lte-pdcp.cc | 3 +-- src/lte/model/lte-rlc-um.cc | 15 +++++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index d111bca97..f1e690823 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -936,6 +936,7 @@ UeManager::SendPacket(uint8_t bid, Ptr p) Ptr bearerInfo = GetDataRadioBearerInfo(drbid); if (bearerInfo) { + NS_LOG_INFO("Send packet to PDCP layer"); LtePdcpSapProvider* pdcpSapProvider = bearerInfo->m_pdcp->GetLtePdcpSapProvider(); pdcpSapProvider->TransmitPdcpSdu(params); } @@ -2598,7 +2599,6 @@ bool LteEnbRrc::SendData(Ptr packet) { NS_LOG_FUNCTION(this << packet); - EpsBearerTag tag; bool found = packet->RemovePacketTag(tag); NS_ASSERT_MSG(found, "no EpsBearerTag found in packet to be sent"); @@ -2607,7 +2607,6 @@ LteEnbRrc::SendData(Ptr packet) NS_LOG_INFO("Sending a packet of " << packet->GetSize() << " bytes to IMSI " << ueManager->GetImsi() << ", RNTI " << ueManager->GetRnti() << ", BID " << (uint16_t)tag.GetBid()); - ueManager->SendData(tag.GetBid(), packet); return true; diff --git a/src/lte/model/lte-pdcp.cc b/src/lte/model/lte-pdcp.cc index e970535f1..a9e8dd839 100644 --- a/src/lte/model/lte-pdcp.cc +++ b/src/lte/model/lte-pdcp.cc @@ -191,8 +191,6 @@ LtePdcp::DoTransmitPdcpSdu(LtePdcpSapProvider::TransmitPdcpSduParameters params) } pdcpHeader.SetDcBit(LtePdcpHeader::DATA_PDU); - - NS_LOG_LOGIC("PDCP header: " << pdcpHeader); p->AddHeader(pdcpHeader); p->AddByteTag(pdcpTag, 1, pdcpHeader.GetSerializedSize()); @@ -203,6 +201,7 @@ LtePdcp::DoTransmitPdcpSdu(LtePdcpSapProvider::TransmitPdcpSduParameters params) txParams.lcid = m_lcid; txParams.pdcpPdu = p; + NS_LOG_INFO("Transmitting PDCP PDU with header: " << pdcpHeader); m_rlcSapProvider->TransmitPdcpPdu(txParams); } diff --git a/src/lte/model/lte-rlc-um.cc b/src/lte/model/lte-rlc-um.cc index e14a105bd..0e19cdfca 100644 --- a/src/lte/model/lte-rlc-um.cc +++ b/src/lte/model/lte-rlc-um.cc @@ -105,7 +105,6 @@ void LteRlcUm::DoTransmitPdcpPdu(Ptr p) { NS_LOG_FUNCTION(this << m_rnti << (uint32_t)m_lcid << p->GetSize()); - if (m_txBufferSize + p->GetSize() <= m_maxTxBufferSize) { if (m_enablePdcpDiscarding) @@ -123,7 +122,7 @@ LteRlcUm::DoTransmitPdcpPdu(Ptr p) NS_LOG_DEBUG("head of line delay in MS:" << headOfLineDelayInMs); if (headOfLineDelayInMs > discardTimerMs) { - NS_LOG_DEBUG("Tx HOL is higher than this packet can allow. RLC SDU discarded"); + NS_LOG_INFO("Tx HOL is higher than this packet can allow. RLC SDU discarded"); NS_LOG_DEBUG("headOfLineDelayInMs = " << headOfLineDelayInMs); NS_LOG_DEBUG("m_packetDelayBudgetMs = " << m_packetDelayBudgetMs); NS_LOG_DEBUG("packet size = " << p->GetSize()); @@ -135,8 +134,7 @@ LteRlcUm::DoTransmitPdcpPdu(Ptr p) LteRlcSduStatusTag tag; tag.SetStatus(LteRlcSduStatusTag::FULL_SDU); p->AddPacketTag(tag); - - NS_LOG_LOGIC("Tx Buffer: New packet added"); + NS_LOG_INFO("Adding RLC SDU to Tx Buffer after adding LteRlcSduStatusTag: FULL_SDU"); m_txBuffer.emplace_back(p, Simulator::Now()); m_txBufferSize += p->GetSize(); NS_LOG_LOGIC("NumOfBuffers = " << m_txBuffer.size()); @@ -145,7 +143,7 @@ LteRlcUm::DoTransmitPdcpPdu(Ptr p) else { // Discard full RLC SDU - NS_LOG_LOGIC("TxBuffer is full. RLC SDU discarded"); + NS_LOG_INFO("Tx Buffer is full. RLC SDU discarded"); NS_LOG_LOGIC("MaxTxBufferSize = " << m_maxTxBufferSize); NS_LOG_LOGIC("txBufferSize = " << m_txBufferSize); NS_LOG_LOGIC("packet size = " << p->GetSize()); @@ -165,11 +163,15 @@ void LteRlcUm::DoNotifyTxOpportunity(LteMacSapUser::TxOpportunityParameters txOpParams) { NS_LOG_FUNCTION(this << m_rnti << (uint32_t)m_lcid << txOpParams.bytes); + NS_LOG_INFO("RLC layer is preparing data for the following Tx opportunity of " + << txOpParams.bytes << " bytes for RNTI=" << m_rnti << ", LCID=" << (uint32_t)m_lcid + << ", CCID=" << (uint32_t)txOpParams.componentCarrierId << ", HARQ ID=" + << (uint32_t)txOpParams.harqId << ", MIMO Layer=" << (uint32_t)txOpParams.layer); if (txOpParams.bytes <= 2) { // Stingy MAC: Header fix part is 2 bytes, we need more bytes for the data - NS_LOG_LOGIC("TX opportunity too small = " << txOpParams.bytes); + NS_LOG_INFO("TX opportunity too small - Only " << txOpParams.bytes << " bytes"); return; } @@ -430,6 +432,7 @@ LteRlcUm::DoNotifyTxOpportunity(LteMacSapUser::TxOpportunityParameters txOpParam params.harqProcessId = txOpParams.harqId; params.componentCarrierId = txOpParams.componentCarrierId; + NS_LOG_INFO("Forward RLC PDU to MAC Layer"); m_macSapProvider->TransmitPdu(params); if (!m_txBuffer.empty())