From 2b5e7ba18453db526316b51476673c1ea69c1a94 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Tue, 19 Jan 2021 17:23:35 +0530 Subject: [PATCH] JIRA-ID ODUHIGH-275 classification of logs of RLC part -3 Change-Id: If98e8eba55df9e23168c8dcc4fa8bacdc604473d Signed-off-by: sphoorthi --- src/5gnrrlc/kw_amm_dl.c | 116 +++++++++++++++++++++------------------------- src/5gnrrlc/kw_ul_ex_ms.c | 17 +++---- src/5gnrrlc/kw_utl_dl.c | 58 +++++++++++------------ src/5gnrrlc/kw_utl_ul.c | 10 ++-- src/5gnrrlc/rlc_mgr.c | 6 +-- src/5gnrrlc/rlc_msg_hdl.c | 36 +++++++------- 6 files changed, 111 insertions(+), 132 deletions(-) diff --git a/src/5gnrrlc/kw_amm_dl.c b/src/5gnrrlc/kw_amm_dl.c index 7e4d6ced5..1bc8ef544 100755 --- a/src/5gnrrlc/kw_amm_dl.c +++ b/src/5gnrrlc/kw_amm_dl.c @@ -35,9 +35,6 @@ File: kw_amm_dl.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="AMM"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=189; /* header include files (.h) */ #include "common_def.h" #include "lkw.h" /* LKW defines */ @@ -364,7 +361,7 @@ RlcDlPduInfo *pduInfo #if (ERRCLASS & ERRCLS_ADD_RES) if (*retx == NULLP) { - RLOG0(L_FATAL, "Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed"); return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -553,14 +550,12 @@ KwuDatCfmInfo **datCfm if ((nackSnInfo->isSegment) && ((retx->soEnd < nackSnInfo->soStart) /*|| (retx->amHdr.so > soEnd)*/)) { - RLOG_ARG3(L_DEBUG, DBG_RBID, rbCb->rlcId.rbId, - "rlcHndlStaRsp: Handle ACK for byte segment, Its " + DU_LOG( "\nDEBUG --> RLC_DL : rlcHndlStaRsp: Handle ACK for byte segment, Its " "sn = %d UEID:%d CELLID:%d", nackSnInfo->sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); - RLOG_ARG4(L_DEBUG, DBG_RBID, rbCb->rlcId.rbId, - "soStart and soEnd = %d, %d, UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : soStart and soEnd = %d, %d, UEID:%d CELLID:%d", retx->amHdr.so, retx->soEnd, rbCb->rlcId.ueId, rbCb->rlcId.cellId); @@ -725,8 +720,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) #if (ERRCLASS & ERRCLS_ADD_RES) if (datCfm == NULLP) { - RLOG_ARG2(L_FATAL,DBG_RBID,rbCb->rlcId.rbId, - "Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); @@ -742,8 +736,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) if(mAckSn > mTxNext) { - RLOG_ARG4(L_WARNING,DBG_RBID, rbCb->rlcId.rbId, - "Invalid ACK SN = %d received. Current Vta =%d" + DU_LOG("\nERROR --> RLC_DL : Invalid ACK SN = %d received. Current Vta =%d" "UEID:%d CELLID:%d", pStaPdu->ackSn, RLC_AMDL.txNextAck, @@ -785,8 +778,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) nackSnInfo.nackRange = pStaPdu->nackInfo[idx].nackRange; nackSnInfo.sn = pStaPdu->nackInfo[idx].sn; - RLOG_ARG3(L_DEBUG,DBG_RBID, rbCb->rlcId.rbId, - "rlcHndlStaRsp: NACK SN = %d UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcHndlStaRsp: NACK SN = %d UEID:%d CELLID:%d", nackSnInfo.sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); @@ -809,8 +801,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) if ((mNackSn > mAckSn) || (mNackSn >= mTxNext)) { /* Erroneous NACK_SN, we should raise an error towards L3 */ - RLOG_ARG2(L_ERROR,DBG_RBID, rbCb->rlcId.rbId, - "Status Pdu is not correct UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Status Pdu is not correct UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, datCfm, sizeof(KwuDatCfmInfo)); @@ -858,8 +849,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) { rlcStatusAckCnt++; /* For All ACKs */ - RLOG_ARG2(L_UNUSED,DBG_RBID, rbCb->rlcId.rbId, - "rlcHndlStaRsp: Received All ACKS UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcHndlStaRsp: Received All ACKS UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); @@ -874,8 +864,7 @@ Void rlcAmmDlHndlStatusPdu(RlcCb *gCb,RlcDlRbCb *rbCb,RlcUdxStaPdu *pStaPdu) { if(datCfm->numSduIds > 1024) { - RLOG_ARG4(L_DEBUG,DBG_RBID,datCfm->rlcId.rbId, - "Sending [%lu] SDU Cfms to PDCP & [%lu] lost for" + DU_LOG("\nDEBUG --> RLC_DL : Sending [%u] SDU Cfms to PDCP & [%u] lost for" "UEID:%d CELLID:%d", datCfm->numSduIds, datCfm->numSduIds-1024, @@ -989,7 +978,7 @@ void rlcAmmQSdu(RlcCb *gCb, RlcDlRbCb *rbCb, Buffer *mBuf, KwuDatReqInfo *datReq #if (ERRCLASS & ERRCLS_ADD_RES) if (sdu == NULLP) { - DU_LOG("\n RLC : rlcAmmQSdu : Memory allocation failed UEID:%d CELLID:%d",\ + DU_LOG("\nERROR --> RLC_DL : rlcAmmQSdu : Memory allocation failed UEID:%d CELLID:%d",\ rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -1020,7 +1009,7 @@ dlrate_kwu += sdu->sduSz; * queue */ if (RLC_AMDL.nxtTx == NULLP) { - DU_LOG("\nRLC : rlcAmmQSdu: Received SDU will be transmitted next \ + DU_LOG("\nDEBUG --> RLC_DL : rlcAmmQSdu: Received SDU will be transmitted next \ UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); RLC_AMDL.nxtTx = sdu; } @@ -1180,7 +1169,7 @@ void rlcAmmProcessSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq, bool f } else { - DU_LOG("\nRLC: rlcAmmProcessSdus: Miscomputation of control Bo. \ + DU_LOG("\nERROR --> RLC_DL : rlcAmmProcessSdus: Miscomputation of control Bo. \ UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); } RLC_AMDL.cntrlBo = 0; @@ -1390,7 +1379,7 @@ static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* kw003.201 - Eliminate MAC Header Size based on bites needed */ tmpSz = RLC_MIN((retx->segSz + retx->hdrSz), rlcDatReq->pduSz); pduSz = (retx->segSz + retx->hdrSz); - /* 5GNR_RLC: length field in 5GNR MAC Hdr is 8/16 btis*/ + /* 5GNR_RLC_DL : length field in 5GNR MAC Hdr is 8/16 btis*/ rlcDatReq->pduSz -= (tmpSz < 255) ? RLC_MAC_HDR_SZ2 : RLC_MAC_HDR_SZ3; /* kw003.201 - We should have at least one more than basic header */ @@ -1405,7 +1394,7 @@ static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { uint8_t pollBit; - DU_LOG("\nRLC: rlcResegRetxPdus: Send retx buf without segmentation " + DU_LOG("\nINFO --> RLC_DL : rlcResegRetxPdus: Send retx buf without segmentation " "UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); if (retx->yetToConst) @@ -1446,7 +1435,7 @@ static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* Segment this pdu / portion of pdu. Insert this segment into */ /* retxLst and update offset */ - DU_LOG("\nRLC: rlcResegRetxPdus: Segment retx buf UEID:%d CELLID:%d", + DU_LOG("\nINFO --> RLC_DL : rlcResegRetxPdus: Segment retx buf UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); /* Eliminate fixed header size if the pdu is segmented for the */ @@ -1483,7 +1472,7 @@ static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) #if (ERRCLASS & ERRCLS_ADD_RES) if (tNode == NULLP) { - DU_LOG("\nRLC: rlcResegRetxPdus: Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcResegRetxPdus: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -1543,10 +1532,10 @@ static void rlcResegRetxPdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) amDl->retxBo -= retx->segSz; } #ifndef ALIGN_64BIT - DU_LOG("\nRLC: rlcResegRetxPdus: retxBo after resegmentation = %ld" + DU_LOG("\nINFO --> RLC_DL : rlcResegRetxPdus: retxBo after resegmentation = %ld" "UEID:%d CELLID:%d", amDl->retxBo, rbCb->rlcId.ueId, rbCb->rlcId.cellId); #else - DU_LOG("\nRLC: rlcResegRetxPdus: retxBo after resegmentation = %d " + DU_LOG("\nINFO --> RLC_DL : rlcResegRetxPdus: retxBo after resegmentation = %d " "UEID:%d CELLID:%d", amDl->retxBo, rbCb->rlcId.ueId, rbCb->rlcId.cellId); #endif @@ -1631,7 +1620,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) #if (ERRCLASS & ERRCLS_ADD_RES) if (discSduInfo == NULLP) { - DU_LOG("\nRLC: rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -1684,7 +1673,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* store the info for sending it to PDCP */ if(discSduInfo->numSduIds > 500) { - DU_LOG("\nRLC: rlcAssembleSdus: This is a big error, we shouldn't be here" + DU_LOG("\nERROR --> RLC_DL : rlcAssembleSdus: This is a big error, we shouldn't be here" "UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); break; } @@ -1722,7 +1711,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) if (RLC_AM_IS_TRANS_WIN_STALLED(amDl)) { //int *a = NULLP; - printf("\n Window stalled \n"); + DU_LOG("\nINFO --> RLC_DL : Window stalled \n"); gRlcStats.amRlcStats.numRlcAmCellWinStall++; //*a = 10; break; @@ -1763,7 +1752,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { uint32_t avblMem = 0; SRegInfoShow(gCb->init.region, &avblMem); - DU_LOG("\nRLC: rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -1782,7 +1771,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) { uint32_t avblMem = 0; SRegInfoShow(gCb->init.region, &avblMem); - DU_LOG("\nRLC: rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : rlcAssembleSdus: Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -1808,7 +1797,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* Update Framing Info */ if (sdu->mode.am.isSegmented) { - /*5GNR RLC: SN should be same for all segment of a SDU*/ + /*5GNR RLC_DL : SN should be same for all segment of a SDU*/ pduInfo->amHdr.sn = sdu->mode.am.sn; pduInfo->amHdr.si = RLC_SI_LAST_SEG; /* binary 10 */ pduInfo->amHdr.so = sdu->actSz - sdu->sduSz; @@ -1816,7 +1805,8 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) gRlcStats.amRlcStats.numRlcAmCellSduTx++; - //printf("\n 5GNRLOG: last segment of lcId %d SduId %u So %u macGrntSz %u sduActSz %u sdu->sduSz %u\n", + //DU_LOG("\nINFO --> RLC_DL : 5GNRLOG: last segment of lcId %d SduId %u So %u macGrntSz\ + %u sduActSz %u sdu->sduSz %u\n", // rbCb->lch.lChId, sdu->mode.am.sduId, pduInfo->amHdr.so, macGrntSz, sdu->actSz, sdu->sduSz); } else @@ -1827,7 +1817,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* Create PDU with hdr and data */ rlcAmmCreatePdu(gCb,rbCb, amHdr, pduInfo, pdu); - //printf("\n Segmentation not required case: numPdu %d pdu %p \n",rlcDatReq->pduInfo.numPdu, pdu); + //DU_LOG("\nINFO --> Segmentation not required case: numPdu %d pdu %p \n",rlcDatReq->pduInfo.numPdu, pdu); #ifdef LTE_L2_MEAS_RLC rlcUtlUpdSduSnMap(rbCb, sdu, rlcDatReq, TRUE); @@ -1870,7 +1860,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) Buffer *remSeg = NULLP; - //printf("\n SDU segmentation case: numPdu %d pdu %p \n", rlcDatReq->pduInfo.numPdu, pdu); + //DU_LOG("\nINFO --> SDU segmentation case: numPdu %d pdu %p \n", rlcDatReq->pduInfo.numPdu, pdu); #ifdef LTE_L2_MEAS if(RLC_MEAS_IS_DL_IP_MEAS_ON_FOR_RB(gCb,rbCb) || RLC_MEAS_IS_DL_DELAY_MEAS_ON_FOR_RB(gCb,rbCb) || @@ -1910,24 +1900,26 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) /* Update SI and SN */ if (sdu->mode.am.isSegmented) { - /*5GNR RLC: SN should be same for all segment of a SDU. + /*5GNR RLC_DL : SN should be same for all segment of a SDU. * Sdu was already segmented and segmenting again*/ pduInfo->amHdr.sn = sdu->mode.am.sn; pduInfo->amHdr.si = RLC_SI_MID_SEG; /* binary 11 */ pduInfo->amHdr.so = sdu->actSz - sdu->sduSz; - //printf("\n 5GNRLOG: mid segment of lcId %d SduId %u So %u macGrntSz %u sduActSz %u sdu->sduSz %u\n", + //DU_LOG("\nINFO --> RLC_DL : 5GNRLOG: mid segment of lcId %d SduId %u So %u macGrntSz %u sduActSz\ + %u sdu->sduSz %u\n", // rbCb->lch.lChId, sdu->mode.am.sduId, txBuf->amHdr.so, macGrntSz, sdu->actSz, sdu->sduSz); } else { - /*5GNR RLC: This means it is the first*/ + /*5GNR RLC_DL : This means it is the first*/ pduInfo->amHdr.si = RLC_SI_FIRST_SEG; /* binary 01 */ - /*5GNR_RLC: Store SN so that in sub-seqent SDU segments will use this SN*/ + /*5GNR_RLC_DL : Store SN so that in sub-seqent SDU segments will use this SN*/ sdu->mode.am.sn = pduInfo->amHdr.sn; pduInfo->amHdr.so = 0; - //printf("\n 5GNRLOG: First segment of lcId %d SduId %u So %u macGrntSz %u sduActSz %u sdu->sduSz %u\n", + //DU_LOG("\nINFO --> RLC_DL : 5GNRLOG: First segment of lcId %d SduId %u So\ + %u macGrntSz %u sduActSz %u sdu->sduSz %u\n", // rbCb->lch.lChId, sdu->mode.am.sduId, txBuf->amHdr.so, macGrntSz, sdu->actSz, sdu->sduSz); } @@ -2032,7 +2024,7 @@ static void rlcAssembleSdus(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDatReq) RLC_SHRABL_STATIC_BUF_FREE(rlckwuSap->pst.region, rlckwuSap->pst.pool, discSduInfo, sizeof(KwuDiscSduInfo)); } - DU_LOG("\nRLC: rlcAssembleSdus: BO after assembly = %d UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcAssembleSdus: BO after assembly = %d UEID:%d CELLID:%d", amDl->bo, rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; } @@ -2094,7 +2086,7 @@ static bool rlcAmmDlCheckAndSetPoll(RlcCb *gCb, RlcDlRbCb *rbCb, bool newPdu, Ms amDl->pollSn = (amDl->txNext - 1) & amDl->snModMask; - DU_LOG("\nRLC: rlcAmmDlCheckAndSetPoll: Poll SN = %d UEID:%d CELLID:%d", + DU_LOG("\nINFO --> RLC_DL : rlcAmmDlCheckAndSetPoll: Poll SN = %d UEID:%d CELLID:%d", amDl->pollSn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); /* kw005.201: Fix for poll retransmission timer. @@ -2141,10 +2133,10 @@ RlcDlPduInfo *pduInfo, Buffer *pdu) /* Update sn */ amHdr->sn = amDl->txNext; - /*5GNR RLC: Increment txNext only if no segmentation of it is a last segment */ + /*5GNR RLC_DL : Increment txNext only if no segmentation of it is a last segment */ if((!amHdr->si) || (amHdr->si == RLC_SI_LAST_SEG)) { - //printf("\n 5GNRLOG: no segment/last seg SDU with lcId %d Sn %u txNext %u So %u\n", + //DU_LOG("\nINFO --> RLC_DL : 5GNRLOG: no segment/last seg SDU with lcId %d Sn %u txNext %u So %u\n", // rbCb->lch.lChId, amHdr->sn, amDl->txNext, amHdr->so); amDl->txNext = (amDl->txNext + 1) & amDl->snModMask; } @@ -2339,8 +2331,7 @@ KwuDatCfmInfo **datCfm #if (ERRCLASS & ERRCLS_ADD_RES) if (*datCfm == NULLP) { - RLOG_ARG2(L_FATAL,DBG_RBID,rbCb->rlcId.rbId, - "Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; @@ -2446,8 +2437,7 @@ RlcRetx *retx #if (ERRCLASS & ERRCLS_ADD_RES) if (staInd == NULLP) { - RLOG_ARG2(L_FATAL,DBG_RBID,rbCb->rlcId.rbId, - "Memory allocation failed UEID:%d CELLID:%d", + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed UEID:%d CELLID:%d", rbCb->rlcId.ueId, rbCb->rlcId.cellId); return; @@ -2558,8 +2548,7 @@ RlcDlRbCb *rbCb if (ROK != rlcDbmFetchDlUeCb(gCb,rlcId.ueId, rlcId.cellId, &ueCb)) { - RLOG_ARG2(L_ERROR,DBG_CELLID, rlcId.cellId, - "UeId [%d]: UeCb not found RBID;%d", + DU_LOG("\nERROR --> RLC_DL : UeId [%d]: UeCb not found RBID;%d", rlcId.ueId, rlcId.rbId); return; @@ -2760,9 +2749,9 @@ KwuDatCfmInfo **datCfm txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, sn); if (txBuf != NULLP) { - RLOG_ARG3(L_UNUSED,DBG_RBID,rbCb->rlcId.rbId, - "rlcAmmDlUpdateTxAndReTxBufForAckSn: ACK for PDU " - "with sn = %ld UEID:%ld CELLID:%ld", + + DU_LOG("\nDEBUG --> RLC_DL : rlcAmmDlUpdateTxAndReTxBufForAckSn: ACK for PDU " + "with sn = %d UEID:%d CELLID:%d", sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); @@ -2832,8 +2821,7 @@ KwuDatCfmInfo **datCfm txBuf = rlcUtlGetTxBuf(RLC_AMDL.txBufLst, sn); if ((txBuf != NULLP)) { - RLOG_ARG3(L_DEBUG,DBG_RBID, rbCb->rlcId.rbId, - "rlcHndlStaRsp: Handle ACK (sn = %d) UEID:%d CELLID:%d", + DU_LOG("\nDEBUG --> RLC_DL : rlcHndlStaRsp: Handle ACK (sn = %d) UEID:%d CELLID:%d", sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); @@ -2994,7 +2982,7 @@ RlcSn sn #if (ERRCLASS & ERRCLS_ADD_RES) if (*retx == NULLP) { - RLOG0(L_FATAL, "Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : Memory allocation failed"); return; } #endif /* ERRCLASS & ERRCLS_RES */ @@ -3197,7 +3185,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat /* set ACK SN */ { - DU_LOG("\nRLC: rlcAssembleCntrlInfo: ACK PDU's SN = %d"\ + DU_LOG("\nINFO --> RLC_DL : rlcAssembleCntrlInfo: ACK PDU's SN = %d"\ "UEID:%d CELLID:%d", ack_sn, rbCb->rlcId.ueId, rbCb->rlcId.cellId); cntrlPdu[0] |= (ack_sn & 0xF00)>> 8; @@ -3315,7 +3303,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat /* set ACK SN */ { - DU_LOG("\nRLC: rlcAssembleCntrlInfo: ACK PDU's SN = %d" + DU_LOG("\nINFO --> RLC_DL : rlcAssembleCntrlInfo: ACK PDU's SN = %d" "UEID:%d CELLID:%d", ack_sn, rbCb->rlcId.ueId,rbCb->rlcId.cellId); cntrlPdu[0] |= (ack_sn & 0x3C000) >> 14; @@ -3327,7 +3315,7 @@ static void rlcAmmCreateStatusPdu(RlcCb *gCb, RlcDlRbCb *rbCb, RlcDatReq *rlcDat else { /* ERROR Log */ - DU_LOG("\nRLC: rlcAssembleCntrlInfo:Conf SN LEN %d is INVALID !!!! \ + DU_LOG("\nERROR --> RLC_DL : rlcAssembleCntrlInfo:Conf SN LEN %d is INVALID !!!! \ UEID:%d CELLID:%d", rbCb->m.amDl.snLen, rbCb->rlcId.ueId, rbCb->rlcId.cellId); } @@ -3611,7 +3599,7 @@ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, if( ROK != rlcDbmFetchDlUeCb(gCb,rnti,cellId,&(ueCb))) { - printf("\n RLC UECb Not found...\n"); + DU_LOG("\nERROR --> RLC_DL : RLC UECb Not found...\n"); return RFAILED; } @@ -3627,7 +3615,7 @@ S16 rlcProcDlStatusPdu(Pst *udxPst,SuId suId, if(ROK != SExamMsg((Data *)(&fByte), rlcSdu, 0)) { - printf("\n Failure in Rlc Hdr SExamMsg\n"); + DU_LOG("\nERROR --> RLC_DL : Failure in Rlc Hdr SExamMsg\n"); return RFAILED; } diff --git a/src/5gnrrlc/kw_ul_ex_ms.c b/src/5gnrrlc/kw_ul_ex_ms.c index 654a92bce..003ff9805 100755 --- a/src/5gnrrlc/kw_ul_ex_ms.c +++ b/src/5gnrrlc/kw_ul_ex_ms.c @@ -28,9 +28,6 @@ File: kw_ul_ex_ms.c *********************************************************************21*/ -static const char* RLOG_MODULE_NAME="RLC_UL"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=206; /** @file kw_ul_ex_ms.c @brief RLC System Services Interface @@ -264,7 +261,7 @@ Buffer *mBuf /* message buffer */ ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_FATAL,"Received Invalid Event[%d] from SM", + DU_LOG("\nERROR --> RLC_UL : Received Invalid Event[%d] from SM", pst->event); } ret = RFAILED; @@ -309,7 +306,7 @@ Buffer *mBuf /* message buffer */ ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_ERROR,"Received Invalid Event[%d] from RLC UL", + DU_LOG("\nERROR --> RLC_UL : Received Invalid Event[%d] from RLC UL", pst->event); } ret = RFAILED; @@ -361,7 +358,7 @@ Buffer *mBuf /* message buffer */ ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_ERROR,"Received Invalid Event[%d] from RRC", + DU_LOG("\nERROR --> RLC_UL : Received Invalid Event[%d] from RRC", pst->event); } ret = RFAILED; @@ -392,7 +389,7 @@ Buffer *mBuf /* message buffer */ ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_ERROR,"Received Invalid Event[%d] from PDCP", + DU_LOG("\nERROR --> RLC_UL : Received Invalid Event[%d] from PDCP", pst->event); } ret = RFAILED; @@ -425,7 +422,7 @@ Buffer *mBuf /* message buffer */ ODU_PUT_MSG_BUF(mBuf); if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_ERROR,"Received Invalid Event[%d] from MAC", + DU_LOG("\nERROR --> RLC_UL : Received Invalid Event[%d] from MAC", pst->event); } ret = RFAILED; @@ -466,7 +463,7 @@ Buffer *mBuf /* message buffer */ } default: { - printf("\n ERROR Invalid Event[%d] from CL to PDCPUL\n", + DU_LOG("\nERROR --> RLC_UL : Invalid Event[%d] from CL to PDCPUL\n", pst->event); ODU_PUT_MSG_BUF(mBuf); break; @@ -480,7 +477,7 @@ Buffer *mBuf /* message buffer */ { if (pst->dstInst < MAX_RLC_INSTANCES) { - RLOG1(L_ERROR, "Received Invalid Source Entity[%d]",pst->event); + DU_LOG("\nERROR --> RLC_UL : Received Invalid Source Entity[%d]",pst->event); } ODU_PUT_MSG_BUF(mBuf); ret = RFAILED; diff --git a/src/5gnrrlc/kw_utl_dl.c b/src/5gnrrlc/kw_utl_dl.c index 1146d201a..7db5db729 100755 --- a/src/5gnrrlc/kw_utl_dl.c +++ b/src/5gnrrlc/kw_utl_dl.c @@ -35,9 +35,6 @@ File: kw_utl_dl.c **********************************************************************/ -static const char* RLOG_MODULE_NAME="UTL"; -static int RLOG_MODULE_ID=2048; -static int RLOG_FILE_ID=209; /** @file kw_utl_dl.c @brief RLC Utility Module @@ -104,24 +101,24 @@ Void PrintRLCStats(Void) RlcCb* dlInst = rlcCb[1]; RlcCb* ulInst = rlcCb[0]; - RLOG4(L_ALWAYS,"RLC Stats: PDUs Sent = (%ld), PdusRext = (%ld), TimeOut = (%ld), SduDiscarded = (%ld)", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: PDUs Sent = (%ld), PdusRext = (%ld), TimeOut = (%ld), SduDiscarded = (%ld)", dlInst->genSts.pdusSent, dlInst->genSts.pdusRetx, dlInst->genSts.protTimeOut, dlInst->genSts.numSduDisc); - RLOG3(L_ALWAYS,"RLC Stats: PDUs Rcvd = (%ld), unexpPdus = (%ld), errorPdus = (%ld)", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: PDUs Rcvd = (%ld), unexpPdus = (%ld), errorPdus = (%ld)", ulInst->genSts.pdusRecv, ulInst->genSts.unexpPdusRecv, ulInst->genSts.errorPdusRecv); - RLOG4(L_ALWAYS,"RLC Stats: RLC_AMDL: " + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMDL: " "StaPduSent:%lu NacksInStaPdu:%lu BytesUnused:%lu PollTimerExpires SRB:%lu ", gRlcStats.amRlcStats.numDLStaPduSent, gRlcStats.amRlcStats.numDLNacksInStaPdu, gRlcStats.amRlcStats.numDLBytesUnused, gRlcStats.amRlcStats.numDLPollTimerExpiresSrb); - RLOG3(L_ALWAYS,"RLC Stats: RLC_AMDL: " + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMDL: " "DRB:%lu MaxRetx:%lu RetransPdus:%lu", gRlcStats.amRlcStats.numDLPollTimerExpiresDrb, gRlcStats.amRlcStats.numDLMaxRetx, gRlcStats.amRlcStats.numDLRetransPdus); - RLOG4(L_ALWAYS,"RLC Stats: RLC_AMUL: " + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMUL: " " PdusDiscarded:%lu ReOrdTimerExpires:%lu StaPduRcvd:%lu NackInStaPduRcvd:%lu ", gRlcStats.amRlcStats.numULPdusDiscarded, gRlcStats.amRlcStats.numULReOrdTimerExpires, gRlcStats.amRlcStats.numULStaPduRcvd, gRlcStats.amRlcStats.numULNackInStaPduRcvd); @@ -149,26 +146,26 @@ Void PrintRLCStats(Void) RlcCb* dlInst = rlcCb[1]; RlcCb* ulInst = rlcCb[0]; - printf ("\n================================ RLC STATS ===========================\n"); - RLOG4(L_ALWAYS,"RLC Stats: PDUs Sent = (%ld), PdusRext = (%ld), TimeOut = (%ld), SduDiscarded = (%ld)", + DU_LOG ("\n ================================ RLC STATS ===========================\n"); + DU_LOG("\nINFO --> RLC_DL : RLC Stats: PDUs Sent = (%d), PdusRext = (%d), TimeOut = (%d), SduDiscarded = (%d)", dlInst->genSts.pdusSent, dlInst->genSts.pdusRetx, dlInst->genSts.protTimeOut, dlInst->genSts.numSduDisc); - RLOG3(L_ALWAYS,"RLC Stats: PDUs Rcvd = (%ld), unexpPdus = (%ld), errorPdus = (%ld)", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: PDUs Rcvd = (%d), unexpPdus = (%d), errorPdus = (%d)", ulInst->genSts.pdusRecv, ulInst->genSts.unexpPdusRecv, ulInst->genSts.errorPdusRecv); - RLOG4(L_ALWAYS,"RLC Stats: RLC_AMDL: " - "StaPduSent:%lu NacksInStaPdu:%lu BytesUnused:%lu PollTimerExpires SRB:%lu ", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMDL: " + "StaPduSent:%u NacksInStaPdu:%u BytesUnused:%u PollTimerExpires SRB:%u ", gRlcStats.amRlcStats.numDLStaPduSent, gRlcStats.amRlcStats.numDLNacksInStaPdu, gRlcStats.amRlcStats.numDLBytesUnused, gRlcStats.amRlcStats.numDLPollTimerExpiresSrb); - RLOG3(L_ALWAYS,"RLC Stats: RLC_AMDL: " - "DRB:%lu MaxRetx:%lu RetransPdus:%lu", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMDL: " + "DRB:%u MaxRetx:%u RetransPdus:%u", gRlcStats.amRlcStats.numDLPollTimerExpiresDrb, gRlcStats.amRlcStats.numDLMaxRetx, gRlcStats.amRlcStats.numDLRetransPdus); - RLOG4(L_ALWAYS,"RLC Stats: RLC_AMUL: " - " PdusDiscarded:%lu ReOrdTimerExpires:%lu StaPduRcvd:%lu NackInStaPduRcvd:%lu ", + DU_LOG("\nINFO --> RLC_DL : RLC Stats: AMUL: " + " PdusDiscarded:%u ReOrdTimerExpires:%u StaPduRcvd:%u NackInStaPduRcvd:%u ", gRlcStats.amRlcStats.numULPdusDiscarded, gRlcStats.amRlcStats.numULReOrdTimerExpires, gRlcStats.amRlcStats.numULStaPduRcvd, gRlcStats.amRlcStats.numULNackInStaPduRcvd); /* RTLIN_DUMP_DEBUG("AM RLC Stats:" @@ -243,7 +240,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) dlData, sizeof(RlcData)); if ( dlData == NULLP ) { - DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dl data"); + DU_LOG("\nERROR --> RLC_DL : rlcSendDedLcDlData: Memory allocation failed for dl data"); RLC_FREE_SHRABL_BUF(RLC_MEM_REGION_DL, RLC_POOL, datReqInfo, sizeof(RguDDatReqInfo)); return RFAILED; @@ -281,7 +278,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) if (dlData->pduInfo[dlData->numPdu].pduBuf == NULLP ) { - DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : rlcSendDedLcDlData: Memory allocation failed"); for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData->pduInfo[pduIdx].pduBuf,\ @@ -310,7 +307,7 @@ uint8_t rlcSendDedLcDlData(Pst *post, SpId spId, RguDDatReqInfo *datReqInfo) dlRrcMsgRsp, sizeof(RlcDlRrcMsgRsp)); if( dlRrcMsgRsp == NULLP ) { - DU_LOG("\nRLC: rlcSendDedLcDlData: Memory allocation failed for dlRrcMsgRsp"); + DU_LOG("\nERROR --> RLC_DL : rlcSendDedLcDlData: Memory allocation failed for dlRrcMsgRsp"); for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { RLC_FREE_SHRABL_BUF(pst.region, pst.pool, dlData->pduInfo[pduIdx].pduBuf,\ @@ -410,7 +407,7 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) #if (ERRCLASS & ERRCLS_ADD_RES) if ( datReqInfo == NULLP ) { - DU_LOG("\nRLC: rlcUtlSendToMac: Memory allocation failed"); + DU_LOG("\nERROR --> RLC_DL : rlcUtlSendToMac: Memory allocation failed"); return RFAILED; } #endif /* ERRCLASS & ERRCLS_ADD_RES */ @@ -422,7 +419,7 @@ uint8_t rlcUtlSendToMac(RlcCb *gCb, SuId suId, KwDStaIndInfo *staIndInfo) if(ROK != rlcDbmFetchDlUeCb(gCb, ueIdx, staIndInfo->cellId,&ueCb)) { /* Fetch UeCb failed */ - DU_LOG("\nRLC: rlcUtlSendToMac: UeId[%u]:ueCb not found", + DU_LOG("\nERROR --> RLC_DL : rlcUtlSendToMac: UeId[%u]:ueCb not found", staInd->rnti); /* If ueCb is not found for current rnti then continue to look for next rnti*/ continue; @@ -1686,9 +1683,9 @@ S16 rlcUtlSndDlL2MeasCfm(RlcCb *gCb,RlcL2MeasEvtCb *measEvtCb) /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT - RLOG1(L_DEBUG,"rlcUtlSndL2MeasCfm(transId(%ld))", measEvtCb->transId); + DU_LOG("\nDEBUG --> RLC_DL : rlcUtlSndL2MeasCfm(transId(%ld))", measEvtCb->transId); #else - RLOG1(L_DEBUG,"rlcUtlSndL2MeasCfm(transId(%d))", measEvtCb->transId); + DU_LOG("\nDEBUG --> RLC_DL : rlcUtlSndL2MeasCfm(transId(%d))", measEvtCb->transId); #endif /* Clean up the RB data structures */ @@ -1904,8 +1901,7 @@ static Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) { if(dlRbCb->mode == RLC_MODE_UM) { - RLOG_ARG3(L_DEBUG,DBG_RBID,dlRbCb->rlcId.rbId, - "UM Downlink UEID:%d CELLID:%d Q size = %d", + DU_LOG("\nDEBUG --> RLC_DL : UM Downlink UEID:%d CELLID:%d Q size = %d", dlRbCb->rlcId.ueId, dlRbCb->rlcId.cellId, (int)dlRbCb->m.umDl.sduQ.count); @@ -1921,14 +1917,12 @@ static Void dumpRLCDlRbInformation(RlcDlRbCb* dlRbCb) numTxPdus++; } } - RLOG_ARG4(L_DEBUG,DBG_RBID,dlRbCb->rlcId.rbId, - "AM Downlink UEID:%d CELLID:%d Sizes SDU Q = %d TX Q = %d ", + DU_LOG("\nDEBUG --> RLC_DL : AM Downlink UEID:%d CELLID:%d Sizes SDU Q = %d TX Q = %d ", dlRbCb->rlcId.ueId, dlRbCb->rlcId.cellId, (int)dlRbCb->m.amDl.sduQ.count, (int)numTxPdus); - RLOG_ARG3(L_DEBUG,DBG_RBID,dlRbCb->rlcId.rbId, - "AM Downlink UEID:%d CELLID:%d RETX Q= %d", + DU_LOG("\nDEBUG --> RLC_DL : AM Downlink UEID:%d CELLID:%d RETX Q= %d", dlRbCb->rlcId.ueId, dlRbCb->rlcId.cellId, (int)dlRbCb->m.amDl.retxLst.count); @@ -2156,7 +2150,7 @@ Void rlcUtlDelTxBuf (CmLListCp *txBufLst,RlcTx *txBuf,RlcCb *gCb) hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; - //printf("D-sn(%d)\n", txBuf->hdr.sn); + //DU_LOG("\nINFO --> RLC_DL : D-sn(%d)\n", txBuf->hdr.sn); cmLListDelFrm(txBufLstCp, &txBuf->lnk); RLC_FREE(gCb, txBuf, sizeof(RlcTx)); return; @@ -2184,7 +2178,7 @@ Void rlcUtlRemovTxBuf(CmLListCp *txBufLst,RlcTx *txBuf,RlcCb *gCb) hashKey = (txBuf->sn % RLC_TX_BUF_BIN_SIZE ); txBufLstCp = &txBufLst[hashKey]; - //printf("D-sn(%d)\n", txBuf->hdr.sn); + //DU_LOG("\nINFO --> RLC_DL : D-sn(%d)\n", txBuf->hdr.sn); cmLListDelFrm(txBufLstCp, &txBuf->lnk); return; } /* rlcUtlRemovTxBuf */ diff --git a/src/5gnrrlc/kw_utl_ul.c b/src/5gnrrlc/kw_utl_ul.c index d27d1daed..6e86951b2 100755 --- a/src/5gnrrlc/kw_utl_ul.c +++ b/src/5gnrrlc/kw_utl_ul.c @@ -107,7 +107,7 @@ uint8_t rlcUtlRcvFrmMac(RlcCb *gCb, KwDatIndInfo *datIndInfo) if( ROK != rlcDbmFetchUlUeCb(gCb,datIndInfo->rnti,datIndInfo->cellId,&(ueCb))) { /* Fetch UeCb failed */ - DU_LOG("\nRLC : rlcUtlRcvFrmMac : UEID:%d UeCb not found", + DU_LOG("\nERROR --> RLC_UL : rlcUtlRcvFrmMac : UEID:%d UeCb not found", datIndInfo->rnti); /* free the buffers inside the datIndInfo */ uint32_t i,j; @@ -432,13 +432,13 @@ Void rlcUtlCalUlIpThrPutIncTTI(RlcCb *gCb,RlcUlRbCb *rbCb,uint32_t ttiCnt) /*starting Task*/ SStartTask(&startTime, PID_RLC_IP_TPT_INCTTI); #ifndef ALIGN_64BIT - RLOG_ARG4(L_UNUSED, DBG_RBID,rbCb->rlcId.rbId,"Log for ul ip throughput:" + DU_LOG("\nDEBUG --> RLC_UL : Log for ul ip throughput:" "RB_MeasOn:%d ttiCnt :%ld UEID:%d CELLID:%d", rbCb->rbL2Cb.measOn,ttiCnt, rbCb->rlcId.ueId, rbCb->rlcId.cellId); #else - RLOG_ARG4(L_UNUSED,DBG_RBID,rbCb->rlcId.rbId, "Log for ul ip throughput:" + DU_LOG("\nDEBUG --> RLC_UL : Log for ul ip throughput:" "RB_MeasOn:%d ttiCnt :%d UEID:%d CELLID:%d", rbCb->rbL2Cb.measOn,ttiCnt, rbCb->rlcId.ueId, @@ -598,9 +598,9 @@ S16 rlcUtlSndUlL2MeasCfm(RlcCb *gCb,RlcL2MeasEvtCb *measEvtCb) /* kw006.201 ccpu00120058 emoved 64 bit compilation warning */ #ifndef ALIGN_64BIT - RLOG1(L_DEBUG,"rlcUtlSndUlL2MeasCfm(transId(%ld))", measEvtCb->transId); + DU_LOG("\nDEBUG --> RLC_UL : rlcUtlSndUlL2MeasCfm(transId(%ld))", measEvtCb->transId); #else - RLOG1(L_DEBUG,"rlcUtlSndUlL2MeasCfm(transId(%d))", measEvtCb->transId); + DU_LOG("\nDEBUG --> RLC_UL : rlcUtlSndUlL2MeasCfm(transId(%d))", measEvtCb->transId); #endif /* Clean up the RB data structures */ diff --git a/src/5gnrrlc/rlc_mgr.c b/src/5gnrrlc/rlc_mgr.c index ffde7c4ea..76d85f37a 100644 --- a/src/5gnrrlc/rlc_mgr.c +++ b/src/5gnrrlc/rlc_mgr.c @@ -71,7 +71,7 @@ uint8_t SendRlcUeRspToDu(Pst *pst, RlcCfgCfmInfo *cfgRsp) RLC_ALLOC_SHRABL_BUF(pst->region, pst->pool, ueRsp, sizeof(RlcUeCfgRsp)); if(!ueRsp) { - DU_LOG("RLC: Memory allocation failed for ueRsp at SendRlcUeCreateRspToDu()"); + DU_LOG("\nERROR --> RLC: Memory allocation failed for ueRsp at SendRlcUeCreateRspToDu()"); ret = RFAILED; } else @@ -83,13 +83,13 @@ uint8_t SendRlcUeRspToDu(Pst *pst, RlcCfgCfmInfo *cfgRsp) ret = (*rlcUeCfgRspOpts[pst->selector])(pst, ueRsp); if(ret) { - DU_LOG("RLC: Failed at SendRlcUeRspToDu()"); + DU_LOG("\nERROR --> RLC: Failed at SendRlcUeRspToDu()"); RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ueRsp, sizeof(RlcUeCfgRsp)); } } else { - DU_LOG("RLC: Failed at fillRlcUeCfgRsp() for event %d", pst->event); + DU_LOG("\nERROR --> RLC: Failed at fillRlcUeCfgRsp() for event %d", pst->event); RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ueRsp, sizeof(RlcUeCfgRsp)); } } diff --git a/src/5gnrrlc/rlc_msg_hdl.c b/src/5gnrrlc/rlc_msg_hdl.c index 28a4f62c5..1b06379aa 100644 --- a/src/5gnrrlc/rlc_msg_hdl.c +++ b/src/5gnrrlc/rlc_msg_hdl.c @@ -125,7 +125,7 @@ void fillEntModeAndDir(uint8_t *entMode, uint8_t *direction, RlcMode rlcMode) *direction = RLC_CFG_DIR_DL; break; default : - DU_LOG("\nRLC: Rlc Mode invalid %d", rlcMode); + DU_LOG("\nERROR --> RLC: Rlc Mode invalid %d", rlcMode); break; } } @@ -254,7 +254,7 @@ uint8_t RlcProcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) RLC_ALLOC(rlcUeCb, rlcUeCfg, sizeof(RlcCfgInfo)); if(rlcUeCfg == NULLP) { - DU_LOG("\nRLC: Failed to allocate memory at RlcProcUeCreateReq()"); + DU_LOG("\nERROR --> RLC: Failed to allocate memory at RlcProcUeCreateReq()"); ret = RFAILED; } else @@ -263,7 +263,7 @@ uint8_t RlcProcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) fillRlcCfg(rlcUeCfg, ueCfg); ret = RlcProcCfgReq(pst, rlcUeCfg); if(ret != ROK) - DU_LOG("\nRLC: Failed to configure Add/Mod/Del entities at RlcProcUeCreateReq()"); + DU_LOG("\nERROR --> RLC: Failed to configure Add/Mod/Del entities at RlcProcUeCreateReq()"); } RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ueCfg, sizeof(RlcUeCfg)); @@ -289,7 +289,7 @@ uint8_t BuildAndSendRrcDeliveryReportToDu( RlcDlRrcMsgInfo *dlRrcMsgInfo ) Pst pst; RrcDeliveryReport *rrcDelivery; - DU_LOG("\nRLC : Filling the RRC Delivery Report"); + DU_LOG("\nINFO --> RLC : Filling RRC Delivery Report"); RLC_ALLOC_SHRABL_BUF(RLC_MEM_REGION_UL, RLC_POOL, rrcDelivery, sizeof(RrcDeliveryReport)); if(rrcDelivery) @@ -307,7 +307,7 @@ uint8_t BuildAndSendRrcDeliveryReportToDu( RlcDlRrcMsgInfo *dlRrcMsgInfo ) } else { - DU_LOG("\nRLC : Memory allocation failed"); + DU_LOG("\nERROR --> RLC : Memory allocation failed"); } return ROK; @@ -336,7 +336,7 @@ uint8_t RlcProcDlRrcMsgTransfer(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo) RLC_SHRABL_STATIC_BUF_ALLOC(RLC_MEM_REGION_DL, RLC_POOL, datReqInfo, sizeof(KwuDatReqInfo)); if(!datReqInfo) { - DU_LOG("\nRLC : Memory allocation failed in RlcProcDlRrcMsgTransfer"); + DU_LOG("\nERROR --> RLC : Memory allocation failed in RlcProcDlRrcMsgTransfer"); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, dlRrcMsgInfo->rrcMsg, dlRrcMsgInfo->msgLen); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo)); return RFAILED; @@ -352,7 +352,7 @@ uint8_t RlcProcDlRrcMsgTransfer(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo) /* Copy fixed buffer to message */ if(ODU_GET_MSG_BUF(RLC_MEM_REGION_UL, RLC_POOL, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at RlcMacProcUlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at RlcMacProcUlData"); RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_DL, RLC_POOL, datReqInfo, sizeof(KwuDatReqInfo)); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, dlRrcMsgInfo->rrcMsg, dlRrcMsgInfo->msgLen); RLC_SHRABL_STATIC_BUF_FREE(pst->region, pst->pool, dlRrcMsgInfo, sizeof(RlcDlRrcMsgInfo)); @@ -408,7 +408,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) RguCDatIndInfo *cLchUlDat; /* UL data on common logical channel */ /* Initializing dedicated logical channel Database */ - DU_LOG("\nRLC: Received UL Data request from MAC"); + DU_LOG("\nDEBUG --> RLC: Received UL Data request from MAC"); for(idx = 0; idx < MAX_NUM_LC; idx++) { dLchData[idx].lcId = idx; @@ -426,7 +426,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) sizeof(RguCDatIndInfo)); if(!cLchUlDat) { - DU_LOG("\nRLC : Memory allocation failed at RlcProcUlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at RlcProcUlData"); ret = RFAILED; break; } @@ -439,7 +439,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) /* Copy fixed buffer to message */ if(ODU_GET_MSG_BUF(RLC_MEM_REGION_UL, RLC_POOL, &cLchUlDat->pdu) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at RlcProcUlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at RlcProcUlData"); RLC_SHRABL_STATIC_BUF_FREE(RLC_MEM_REGION_UL, RLC_POOL, cLchUlDat, \ sizeof(RguCDatIndInfo)); ret = RFAILED; @@ -458,7 +458,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) sizeof(RguDDatIndInfo)); if(!dLchUlDat) { - DU_LOG("\nRLC : Memory allocation failed at RlcMacProcUlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at RlcMacProcUlData"); ret = RFAILED; break; } @@ -470,7 +470,7 @@ uint8_t RlcProcUlData(Pst *pst, RlcData *ulData) if(ODU_GET_MSG_BUF(RLC_MEM_REGION_UL, RLC_POOL, \ &dLchData[lcId].pdu.mBuf[dLchData[lcId].pdu.numPdu]) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at RlcMacProcUlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at RlcMacProcUlData"); for(pduIdx=0; pduIdx < dLchData[lcId].pdu.numPdu; pduIdx++) { ODU_PUT_MSG_BUF(dLchData[lcId].pdu.mBuf[dLchData[lcId].pdu.numPdu]); @@ -546,7 +546,7 @@ uint8_t RlcProcSchedResultRpt(Pst *pst, RlcSchedResultRpt *schRep) RguCStaIndInfo *cLchSchInfo; /* Common logical channel scheduling result */ RguDStaIndInfo *dLchSchInfo; /* Dedicated logical channel scheduling result */ - DU_LOG("\nRLC : Received scheduling report from MAC"); + DU_LOG("\nDEBUG --> RLC : Received scheduling report from MAC"); for(idx=0; idx < schRep->numLc; idx++) { /* If it is common channel, fill status indication information @@ -557,7 +557,7 @@ uint8_t RlcProcSchedResultRpt(Pst *pst, RlcSchedResultRpt *schRep) sizeof(RguCStaIndInfo)); if(!cLchSchInfo) { - DU_LOG("\nRLC: RlcProcSchedResultRpt: Memory allocation failed for cLchSchInfo"); + DU_LOG("\nERROR --> RLC: RlcProcSchedResultRpt: Memory allocation failed for cLchSchInfo"); ret = RFAILED; break; } @@ -581,7 +581,7 @@ uint8_t RlcProcSchedResultRpt(Pst *pst, RlcSchedResultRpt *schRep) sizeof(RguDStaIndInfo)); if(!dLchSchInfo) { - DU_LOG("\nRLC: RlcProcSchedResultRpt: Memory allocation failed for dLchSchInfo"); + DU_LOG("\nERROR --> RLC: RlcProcSchedResultRpt: Memory allocation failed for dLchSchInfo"); ret = RFAILED; break; } @@ -647,13 +647,13 @@ uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) RlcCfgInfo *rlcUeCfg = NULLP; //Seed code Rlc cfg struct RlcCb *rlcUeCb = NULLP; - DU_LOG("\nRLC: UE reconfig request received. CellID[%d] UEIDX[%d]",ueCfg->cellId, ueCfg->ueIdx); + DU_LOG("\nDEBUG --> RLC: UE reconfig request received. CellID[%d] UEIDX[%d]",ueCfg->cellId, ueCfg->ueIdx); rlcUeCb = RLC_GET_RLCCB(pst->dstInst); RLC_ALLOC(rlcUeCb, rlcUeCfg, sizeof(RlcCfgInfo)); if(rlcUeCfg == NULLP) { - DU_LOG("\nRLC: Failed to allocate memory at RlcProcUeReconfigReq()"); + DU_LOG("\nERROR --> RLC: Failed to allocate memory at RlcProcUeReconfigReq()"); ret = RFAILED; } else @@ -662,7 +662,7 @@ uint8_t RlcProcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) fillRlcCfg(rlcUeCfg, ueCfg); ret = RlcProcCfgReq(pst, rlcUeCfg); if(ret != ROK) - DU_LOG("\nRLC: Failed to configure Add/Mod/Del entities at RlcProcUeReconfigReq()"); + DU_LOG("\nERROR --> RLC: Failed to configure Add/Mod/Del entities at RlcProcUeReconfigReq()"); } RLC_FREE_SHRABL_BUF(pst->region, pst->pool, ueCfg, sizeof(RlcUeCfg)); -- 2.16.6