From 0040ecd8cd39312eab76f039945dd24c46c8f82e Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Wed, 13 Jan 2021 13:46:30 +0530 Subject: [PATCH] separation of logs Part-3 Change-Id: I858db4f6adc1979c195d2da54447b464d0ef913e Signed-off-by: sphoorthi --- src/5gnrmac/mac_demux.c | 8 ++++---- src/5gnrmac/mac_msg_hdl.c | 32 ++++++++++++++++---------------- src/5gnrmac/mac_mux.c | 4 ++-- src/5gnrmac/mac_slot_ind.c | 16 ++++++++-------- src/5gnrmac/mac_stop_ind.c | 4 ++-- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/5gnrmac/mac_demux.c b/src/5gnrmac/mac_demux.c index 7dbf665b6..1ef7f01e3 100644 --- a/src/5gnrmac/mac_demux.c +++ b/src/5gnrmac/mac_demux.c @@ -85,7 +85,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData MAC_ALLOC_SHRABL_BUF(pdu, length); if(!pdu) { - DU_LOG("\nMAC : UL CCCH PDU memory allocation failed"); + DU_LOG("\nERROR --> MAC : UL CCCH PDU memory allocation failed"); return RFAILED; } idx++; @@ -103,7 +103,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData case MAC_LCID_MIN ... MAC_LCID_MAX : { - DU_LOG("\nMAC : PDU received for LC ID %d", lcId); + DU_LOG("\nINFO --> MAC : PDU received for LC ID %d", lcId); pduLen--; idx++; @@ -119,7 +119,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData MAC_ALLOC_SHRABL_BUF(pdu, length); if(!pdu) { - DU_LOG("\nMAC : Memory allocation failed while demuxing Rx Data PDU"); + DU_LOG("\nERROR --> MAC : Memory allocation failed while demuxing Rx Data PDU"); return RFAILED; } pduLen--; @@ -205,7 +205,7 @@ uint8_t unpackRxData(uint16_t cellId, SlotIndInfo slotInfo, RxDataIndPdu *rxData default: { - DU_LOG("\nMAC : Invalid LC Id %d", lcId); + DU_LOG("\nERROR --> MAC : Invalid LC Id %d", lcId); return RFAILED; } } /* End of switch */ diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 694cd7485..f18c9d4c7 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -143,7 +143,7 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) { uint16_t cellIdx; CrcIndInfo crcIndInfo; - DU_LOG("\nMAC : Received CRC indication"); + DU_LOG("\nDEBUG --> MAC : Received CRC indication"); GET_CELL_IDX(crcInd->cellId, cellIdx); /* Considering one pdu and one preamble */ crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId; @@ -177,7 +177,7 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { uint16_t pduIdx; - DU_LOG("\nMAC : Received Rx Data indication"); + DU_LOG("\nDEBUG --> MAC : Received Rx Data indication"); /* TODO : compare the handle received in RxDataInd with handle send in PUSCH * PDU, which is stored in raCb */ @@ -217,7 +217,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) MacDlSlot *currDlSlot = NULLP; memset(&macDlData , 0, sizeof(MacDlData)); - DU_LOG("\nMAC: Received DL data for sfn=%d slot=%d", \ + DU_LOG("\nDEBUG --> MAC: Received DL data for sfn=%d slot=%d", \ dlData->slotInfo.sfn, dlData->slotInfo.slot); /* Copy the pdus to be muxed into mac Dl data */ macDlData.numPdu = dlData->numPdu; @@ -238,7 +238,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) MAC_ALLOC(txPdu, tbSize); if(!txPdu) { - DU_LOG("\nMAC : Memory allocation failed in MacProcRlcDlData"); + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); return RFAILED; } macMuxPdu(&macDlData, NULLP, txPdu, tbSize); @@ -292,7 +292,7 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcData)); if(!ulData) { - DU_LOG("\nMAC : Memory allocation failed while sending UL data to RLC"); + DU_LOG("\nERROR --> MAC : Memory allocation failed while sending UL data to RLC"); return RFAILED; } memset(ulData, 0, sizeof(RlcData)); @@ -380,11 +380,11 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) MAC_ALLOC_SHRABL_BUF(schedRpt, sizeof(RlcSchedResultRpt)); if(!schedRpt) { - DU_LOG("\nMAC: Memory allocation failure in sendSchResultRepToRlc"); + DU_LOG("\nERROR --> MAC: Memory allocation failure in sendSchResultRepToRlc"); return RFAILED; } - DU_LOG("\nMAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot); + DU_LOG("\nDEBUG --> MAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot); schedRpt->cellId = dlInfo.cellId; schedRpt->rnti = dlInfo.dlMsgAlloc->crnti; schedRpt->numLc = dlInfo.dlMsgAlloc->numLc; @@ -402,7 +402,7 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) FILL_PST_MAC_TO_RLC(pst, RLC_DL_INST, EVENT_SCHED_RESULT_TO_RLC); if(MacSendSchedResultRptToRlc(&pst, schedRpt) != ROK) { - DU_LOG("\nMAC: Failed to send Schedule result report to RLC"); + DU_LOG("\nERROR --> MAC: Failed to send Schedule result report to RLC"); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, schedRpt, sizeof(RlcSchedResultRpt)); return RFAILED; } @@ -429,7 +429,7 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) * ****************************************************************/ uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) { - DU_LOG("\nMAC : Handling cell start request"); + DU_LOG("\nINFO --> MAC : Handling cell start request"); gSlotCount = 0; sendToLowerMac(START_REQUEST, 0, cellId); @@ -462,7 +462,7 @@ uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) uint16_t cellIdx; SlotIndInfo slotInfo; - DU_LOG("\nMAC : Sending cell stop request to Lower Mac"); + DU_LOG("\nINFO --> MAC : Sending cell stop request to Lower Mac"); GET_CELL_IDX(cellId->cellId, cellIdx); slotInfo.cellId = cellId->cellId; slotInfo.sfn = macCb.macCell[cellIdx]->currTime.sfn; @@ -501,7 +501,7 @@ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) DlRlcBoInfo dlBoInfo; memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); - DU_LOG("\nMAC : Handling DL CCCH IND"); + DU_LOG("\nDEBUG --> MAC : Handling DL CCCH IND"); GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx); @@ -566,7 +566,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, MAC_ALLOC_SHRABL_BUF(ulCcchIndInfo, sizeof(UlCcchIndInfo)); if(!ulCcchIndInfo) { - DU_LOG("\nMAC: Memory failed in macProcUlCcchInd"); + DU_LOG("\nERROR --> MAC: Memory failed in macProcUlCcchInd"); return RFAILED; } @@ -580,7 +580,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK) { - DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP"); + DU_LOG("\nERROR --> MAC: Failed to send UL CCCH Ind to DU APP"); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, ulCcchIndInfo->ulCcchMsgLen); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo, sizeof(UlCcchIndInfo)); ret = RFAILED; @@ -700,7 +700,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUCCH_F0F1: if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres) { - DU_LOG("\nMAC : Received SR UCI indication"); + DU_LOG("\nDEBUG --> MAC : Received SR UCI indication"); crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; ret = buildAndSendSrInd(macUciInd, crnti); } @@ -708,7 +708,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUCCH_F2F3F4: break; default: - DU_LOG("\nMAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); + DU_LOG("\nERROR --> MAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); ret = RFAILED; break; } @@ -718,7 +718,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) } else { - DU_LOG("\nMAC: Received Uci Ind is NULL at FapiMacUciInd()"); + DU_LOG("\nERROR --> MAC: Received Uci Ind is NULL at FapiMacUciInd()"); ret = RFAILED; } MAC_FREE_SHRABL_BUF(pst->region, pst->pool, macUciInd, sizeof(UciInd)); diff --git a/src/5gnrmac/mac_mux.c b/src/5gnrmac/mac_mux.c index a72639579..153db7548 100644 --- a/src/5gnrmac/mac_mux.c +++ b/src/5gnrmac/mac_mux.c @@ -315,7 +315,7 @@ void macMuxPdu(MacDlData *dlData, MacCeInfo *macCeData, uint8_t *txPdu, uint16_t break; } default: - DU_LOG("\n MAC: Invalid LCID %d in mac pdu",lcid); + DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid); break; } } @@ -353,7 +353,7 @@ void macMuxPdu(MacDlData *dlData, MacCeInfo *macCeData, uint8_t *txPdu, uint16_t } default: - DU_LOG("\n MAC: Invalid LCID %d in mac pdu",lcid); + DU_LOG("\nERROR --> MAC: Invalid LCID %d in mac pdu",lcid); break; } diff --git a/src/5gnrmac/mac_slot_ind.c b/src/5gnrmac/mac_slot_ind.c index a58a1b709..2ea5be994 100644 --- a/src/5gnrmac/mac_slot_ind.c +++ b/src/5gnrmac/mac_slot_ind.c @@ -157,7 +157,7 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgAlloc *msg4Alloc) } else { - DU_LOG("\nMAC: Failed allocating memory for msg4TxPdu"); + DU_LOG("\nERROR --> MAC: Failed allocating memory for msg4TxPdu"); } /* Free memory allocated */ MAC_FREE(msg4DlData.pduInfo[0].dlPdu, macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen); @@ -177,7 +177,7 @@ void fillMsg4Pdu(uint16_t cellId, DlMsgAlloc *msg4Alloc) } else { - DU_LOG("\nMAC: Failed at macMuxPdu()"); + DU_LOG("\nERROR --> MAC: Failed at macMuxPdu()"); } } @@ -264,7 +264,7 @@ int sendCellUpIndMacToDuApp(uint16_t cellId) MAC_ALLOC_SHRABL_BUF(oduCellId, sizeof(OduCellId)); if(!oduCellId) { - DU_LOG("\nMAC : Memory allocation failed for cell up indication"); + DU_LOG("\nERROR --> MAC : Memory allocation failed for cell up indication"); return RFAILED; } oduCellId->cellId = cellId; @@ -275,7 +275,7 @@ int sendCellUpIndMacToDuApp(uint16_t cellId) ret = MacDuAppCellUpInd(&pst, oduCellId); if(ret != ROK) { - DU_LOG("\nMAC: Failed to send cell up indication to DU APP"); + DU_LOG("\nERROR --> MAC: Failed to send cell up indication to DU APP"); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, oduCellId, sizeof(OduCellId)); } @@ -345,7 +345,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) volatile uint32_t startTime=0; #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\nMAC : Slot Indication received"); + DU_LOG("\nDEBUG --> MAC : Slot Indication received"); #endif /*starting Task*/ ODU_START_TASK(&startTime, PID_MAC_TTI_IND); @@ -358,7 +358,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) ret = sendSlotIndMacToSch(slotInd); if(ret != ROK) { - DU_LOG("\nMAC : Sending of slot ind msg from MAC to SCH failed"); + DU_LOG("\nERROR --> MAC : Sending of slot ind msg from MAC to SCH failed"); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo)); return ret; } @@ -366,7 +366,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) ret = macProcSlotInd(*slotInd); if(ret != ROK) { - DU_LOG("\nMAC : macProcSlotInd failed"); + DU_LOG("\nERROR --> MAC : macProcSlotInd failed"); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo)); return ret; } @@ -378,7 +378,7 @@ uint8_t fapiMacSlotInd(Pst *pst, SlotIndInfo *slotInd) ret = sendCellUpIndMacToDuApp(slotInd->cellId); if(ret != ROK) { - DU_LOG("\nMAC :Sending of slot ind msg from MAC to DU APP failed"); + DU_LOG("\nERROR --> MAC :Sending of slot ind msg from MAC to DU APP failed"); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, slotInd, sizeof(SlotIndInfo)); return ret; } diff --git a/src/5gnrmac/mac_stop_ind.c b/src/5gnrmac/mac_stop_ind.c index c1adb7d8f..6238dce9b 100644 --- a/src/5gnrmac/mac_stop_ind.c +++ b/src/5gnrmac/mac_stop_ind.c @@ -53,7 +53,7 @@ uint8_t sendStopIndToDuApp(uint16_t cellId) MAC_ALLOC_SHRABL_BUF(oduCellId, sizeof(OduCellId)); if(!oduCellId) { - DU_LOG("\nMAC : Stop Indication memory allocation failed"); + DU_LOG("\nERROR --> MAC : Stop Indication memory allocation failed"); return RFAILED; } oduCellId->cellId = cellId; @@ -64,7 +64,7 @@ uint8_t sendStopIndToDuApp(uint16_t cellId) ret = MacDuAppStopInd(&pst, oduCellId); if(ret != ROK) { - DU_LOG("\nMAC: Failed to send stop indication to DU APP"); + DU_LOG("\nERROR --> MAC: Failed to send stop indication to DU APP"); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, oduCellId, sizeof(OduCellId)); } return ROK; -- 2.16.6