From: Sphoorthi Dayanand Date: Fri, 12 Feb 2021 15:24:08 +0000 (+0000) Subject: Merge "Classification of CM logs [JIRA ID - ODUHIGH-275]" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ec3126edc859f70045642c4fee472943a5108d11;hp=775c05505b7b9ae227bbe72b0e0bf32b52e6a89f;p=o-du%2Fl2.git Merge "Classification of CM logs [JIRA ID - ODUHIGH-275]" --- diff --git a/src/cm/cm_mblk.c b/src/cm/cm_mblk.c index 630c62cf9..02dbe2013 100644 --- a/src/cm/cm_mblk.c +++ b/src/cm/cm_mblk.c @@ -102,12 +102,12 @@ Ptr *ptr /* Location to place allocated event ptr */ #ifndef LTE_ENB_PAL if( evntSize > maxBlkSize) { - printf("\nNot Allocating memory for Event\n"); + DU_LOG("\nERROR --> Not Allocating memory for Event\n"); #ifdef ALIGN_64BIT - printf("eventSize [%d] greater than maxBlkSize [%d]\n", + DU_LOG("\nERROR --> eventSize [%d] greater than maxBlkSize [%d]\n", evntSize, maxBlkSize); #else - printf("eventSize [%ld] greater than maxBlkSize [%ld]\n", + DU_LOG("\nERROR --> eventSize [%ld] greater than maxBlkSize [%ld]\n", evntSize, maxBlkSize); #endif return RFAILED; diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 2c4b8c3de..244bff9cf 100755 --- a/src/cm/cm_tenb_stats.c +++ b/src/cm/cm_tenb_stats.c @@ -50,7 +50,7 @@ #include "cm_lte.h" /* Common LTE header file */ #include "cm_llist.h" /* Linked list header file */ #include "cm_tkns.h" /* Common tokens header file */ - +#include "du_log.h" /* header/extern include files (.x) */ @@ -148,7 +148,7 @@ static Buffer* TSInfUtlAllocMsg(Pst *pst) if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - printf("\n MBuf Allocation failed\n"); + DU_LOG("\nERROR --> RLC : MBuf Allocation failed\n"); } return (mBuf); } diff --git a/src/cm/du_app_mac_inf.c b/src/cm/du_app_mac_inf.c index e1ef58f52..385ca1809 100644 --- a/src/cm/du_app_mac_inf.c +++ b/src/cm/du_app_mac_inf.c @@ -55,7 +55,7 @@ uint8_t packMacCellCfg(Pst *pst, MacCellCfg *macCellCfg) /* pack the address of the structure */ CMCHKPK(oduPackPointer,(PTR)macCellCfg, mBuf); - DU_LOG("\nDU-APP : MAC CELL config sent"); + DU_LOG("\nDEBUG --> DU-APP : MAC CELL config sent"); return ODU_POST_TASK(pst,mBuf); } return ROK; @@ -206,7 +206,7 @@ uint8_t packMacCellStart(Pst *pst, OduCellId *cellId) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nDU APP : Memory allocation failed for cell start req pack"); + DU_LOG("\nERROR --> DU APP : Memory allocation failed for cell start req pack"); return RFAILED; } @@ -284,7 +284,7 @@ uint8_t packMacCellStop(Pst *pst, OduCellId *cellId) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nDU APP : Memory allocation failed for cell stop req pack"); + DU_LOG("\nERROR --> DU APP : Memory allocation failed for cell stop req pack"); return RFAILED; } @@ -356,7 +356,7 @@ uint8_t packMacCellUpInd(Pst *pst, OduCellId *cellId) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nDU APP : Memory allocation failed for packMacCellUpInd"); + DU_LOG("\nERROR --> DU APP : Memory allocation failed for packMacCellUpInd"); return RFAILED; } @@ -446,14 +446,13 @@ uint8_t packMacStopInd(Pst *pst, OduCellId *cellId) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nDU APP : Memory allocation failed for stop Ind pack"); + DU_LOG("\nERROR --> DU APP : Memory allocation failed for stop Ind pack"); return RFAILED; } if(pst->selector == ODU_SELECTOR_LC) { /*pack the payload here*/ - DU_LOG("\nDU APP : Packed CellId"); CMCHKPK(oduUnpackUInt16, cellId->cellId, mBuf); CM_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, sizeof(OduCellId)); cellId = NULL; @@ -542,7 +541,7 @@ uint8_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packMacUlCcchInd"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packMacUlCcchInd"); return RFAILED; } /* pack the address of the structure */ @@ -550,7 +549,7 @@ uint8_t packMacUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo) } else { - DU_LOG("\nMAC: Only LWLC supported for UL CCCH Ind "); + DU_LOG("\nERROR --> MAC: Only LWLC supported for UL CCCH Ind "); return RFAILED; } @@ -589,7 +588,7 @@ uint8_t unpackMacUlCcchInd(DuMacUlCcchInd func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\n Only LWLC supported for UL CCCH Ind "); + DU_LOG("\nERROR --> MAC : Only LWLC supported for UL CCCH Ind "); ODU_PUT_MSG_BUF(mBuf); } return RFAILED; @@ -621,7 +620,7 @@ uint8_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packMacDlCcchInd"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packMacDlCcchInd"); return RFAILED; } /* pack the address of the structure */ @@ -629,7 +628,7 @@ uint8_t packMacDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) } else { - DU_LOG("\nDU APP: Only LWLC supported for DL CCCH Ind "); + DU_LOG("\nERROR --> DU APP : Only LWLC supported for DL CCCH Ind "); return RFAILED; } @@ -668,7 +667,7 @@ uint8_t unpackMacDlCcchInd(DuMacDlCcchInd func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\n Only LWLC supported for DL CCCH Ind "); + DU_LOG("\nERROR --> DU APP : Only LWLC supported for DL CCCH Ind "); ODU_PUT_MSG_BUF(mBuf); } @@ -701,7 +700,7 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packDuMacUeCreateReq"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packDuMacUeCreateReq"); return RFAILED; } /* pack the address of the structure */ @@ -709,7 +708,7 @@ uint8_t packDuMacUeCreateReq(Pst *pst, MacUeCfg *ueCfg) } else { - DU_LOG("\nMAC: Only LWLC supported for packDuMacUeCreateReq"); + DU_LOG("\nERROR --> MAC: Only LWLC supported for packDuMacUeCreateReq"); return RFAILED; } @@ -748,7 +747,7 @@ uint8_t unpackMacUeCreateReq(DuMacUeCreateReq func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\n Only LWLC supported for UE Create Request "); + DU_LOG("\nERROR --> DU APP : Only LWLC supported for UE Create Request "); ODU_PUT_MSG_BUF(mBuf); } @@ -779,7 +778,7 @@ uint8_t packDuMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packDuMacUeCfgRsp"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packDuMacUeCfgRsp"); return RFAILED; } /* pack the address of the structure */ @@ -787,7 +786,7 @@ uint8_t packDuMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) } else { - DU_LOG("\nMAC: Only LWLC supported for packDuMacUeCfgRsp"); + DU_LOG("\nERROR --> MAC: Only LWLC supported for packDuMacUeCfgRsp"); return RFAILED; } @@ -851,7 +850,7 @@ uint8_t packDuMacUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packDuMacUeReconfigReq"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packDuMacUeReconfigReq"); return RFAILED; } /* pack the address of the structure */ @@ -859,7 +858,7 @@ uint8_t packDuMacUeReconfigReq(Pst *pst, MacUeCfg *ueCfg) } else { - DU_LOG("\nMAC: Only LWLC supported for packDuMacUeReconfigReq"); + DU_LOG("\nERROR --> MAC: Only LWLC supported for packDuMacUeReconfigReq"); return RFAILED; } @@ -897,7 +896,7 @@ uint8_t unpackMacUeReconfigReq(DuMacUeReconfigReq func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\n Only LWLC supported for UE Create Request "); + DU_LOG("\nERROR --> DU APP : Only LWLC supported for UE Create Request "); ODU_PUT_MSG_BUF(mBuf); } diff --git a/src/cm/du_app_rlc_inf.c b/src/cm/du_app_rlc_inf.c index b2ec5813e..d85e02f55 100644 --- a/src/cm/du_app_rlc_inf.c +++ b/src/cm/du_app_rlc_inf.c @@ -45,7 +45,7 @@ uint8_t packDuRlcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packDuRlcUeCreateReq"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packDuRlcUeCreateReq"); return RFAILED; } /* pack the address of the structure */ @@ -53,7 +53,7 @@ uint8_t packDuRlcUeCreateReq(Pst *pst, RlcUeCfg *ueCfg) } else { - DU_LOG("\nRLC: Only LWLC supported for packDuRlcUeCreateReq"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packDuRlcUeCreateReq"); return RFAILED; } @@ -91,7 +91,7 @@ uint8_t unpackRlcUeCreateReq(DuRlcUeCreateReq func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for UE Create Request "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for UE Create Request "); ODU_PUT_MSG_BUF(mBuf); } @@ -124,7 +124,7 @@ uint8_t packRlcDuUeCfgRsp(Pst *pst, RlcUeCfgRsp *ueCfg) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packRlcDuUeCfgRsp"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRlcDuUeCfgRsp"); return RFAILED; } /* pack the address of the structure */ @@ -132,7 +132,7 @@ uint8_t packRlcDuUeCfgRsp(Pst *pst, RlcUeCfgRsp *ueCfg) } else { - DU_LOG("\nRLC: Only LWLC supported for packRlcDuUeCfgRsp"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packRlcDuUeCfgRsp"); return RFAILED; } @@ -170,7 +170,7 @@ uint8_t unpackRlcUeCfgRsp(RlcDuUeCfgRsp func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for UE Cfg Response "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for UE Cfg Response "); ODU_PUT_MSG_BUF(mBuf); } @@ -202,7 +202,7 @@ uint8_t packRlcUlRrcMsgToDu(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packRlcUlRrcMsgToDu"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRlcUlRrcMsgToDu"); return RFAILED; } /* pack the address of the structure */ @@ -211,7 +211,7 @@ uint8_t packRlcUlRrcMsgToDu(Pst *pst, RlcUlRrcMsgInfo *ulRrcMsgInfo) } else { - DU_LOG("\nRLC: Only LWLC supported for packRlcUlRrcMsgToDu"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packRlcUlRrcMsgToDu"); } return RFAILED; } @@ -245,7 +245,7 @@ uint8_t unpackRlcUlRrcMsgToDu(RlcUlRrcMsgToDuFunc func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for UL RRC Message transfer "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for UL RRC Message transfer "); ODU_PUT_MSG_BUF(mBuf); } @@ -276,7 +276,7 @@ uint8_t packDlRrcMsgToRlc(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packRlcDlRrcMsgToRlc"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRlcDlRrcMsgToRlc"); return RFAILED; } /* pack the address of the structure */ @@ -285,7 +285,7 @@ uint8_t packDlRrcMsgToRlc(Pst *pst, RlcDlRrcMsgInfo *dlRrcMsgInfo) } else { - DU_LOG("\nRLC: Only LWLC supported for packDlRrcMsgToRlc"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packDlRrcMsgToRlc"); } return RFAILED; } @@ -321,7 +321,7 @@ uint8_t unpackDlRrcMsgToRlc(DuDlRrcMsgToRlcFunc func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for UL RRC Message transfer "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for UL RRC Message transfer "); ODU_PUT_MSG_BUF(mBuf); } return RFAILED; @@ -353,7 +353,7 @@ uint8_t packRrcDeliveryReportToDu(Pst *pst, RrcDeliveryReport *rrcDeliveryReport { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packRrcDeliveryReportToDu"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRrcDeliveryReportToDu"); return RFAILED; } /* pack the address of the structure */ @@ -362,7 +362,7 @@ uint8_t packRrcDeliveryReportToDu(Pst *pst, RrcDeliveryReport *rrcDeliveryReport } else { - DU_LOG("\nRLC: Only LWLC supported for packRrcDeliveryReportToDu"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packRrcDeliveryReportToDu"); } return RFAILED; } @@ -398,7 +398,7 @@ uint8_t unpackRrcDeliveryReportToDu(RlcRrcDeliveryReportToDuFunc func, Pst *pst, else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for RRC delivery Message transfer "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for RRC delivery Message transfer "); ODU_PUT_MSG_BUF(mBuf); } @@ -431,7 +431,7 @@ uint8_t packDuRlcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packDuRlcUeReconfigReq"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packDuRlcUeReconfigReq"); return RFAILED; } /* pack the address of the structure */ @@ -439,7 +439,7 @@ uint8_t packDuRlcUeReconfigReq(Pst *pst, RlcUeCfg *ueCfg) } else { - DU_LOG("\nRLC: Only LWLC supported for packDuRlcUeReconfigReq"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packDuRlcUeReconfigReq"); return RFAILED; } @@ -476,7 +476,7 @@ uint8_t unpackRlcUeReconfigReq(DuRlcUeReconfigReq func, Pst *pst, Buffer *mBuf) else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for UE Create Request "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for UE Create Request "); ODU_PUT_MSG_BUF(mBuf); } return RFAILED; @@ -507,7 +507,7 @@ uint8_t packRlcDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsgRsp) { if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC : Memory allocation failed at packRlcDlRrcMsgRspToDu"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRlcDlRrcMsgRspToDu"); return RFAILED; } /* pack the address of the structure */ @@ -516,7 +516,7 @@ uint8_t packRlcDlRrcMsgRspToDu(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsgRsp) } else { - DU_LOG("\nRLC: Only LWLC supported for packRlcDlRrcMsgRspToDu"); + DU_LOG("\nERROR --> RLC: Only LWLC supported for packRlcDlRrcMsgRspToDu"); } return RFAILED; } @@ -550,7 +550,7 @@ uint8_t unpackRlcDlRrcMsgRspToDu(RlcDlRrcMsgRspToDuFunc func, Pst *pst, Buffer * else { /* Nothing to do for other selectors */ - DU_LOG("\nRLC: Only LWLC supported for DL RRC Message transfer "); + DU_LOG("\nERROR --> RLC: Only LWLC supported for DL RRC Message transfer "); ODU_PUT_MSG_BUF(mBuf); } return RFAILED; diff --git a/src/cm/rlc_mac_inf.c b/src/cm/rlc_mac_inf.c index c431c6807..b79297684 100644 --- a/src/cm/rlc_mac_inf.c +++ b/src/cm/rlc_mac_inf.c @@ -38,7 +38,7 @@ uint8_t packRlcBoStatus(Pst* pst, RlcBoStatus *boStatus) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC: Memory allocation failed at packBOStatus"); + DU_LOG("\nERROR --> RLC: Memory allocation failed at packBOStatus"); return RFAILED; } @@ -109,7 +109,7 @@ uint8_t packRlcSchedResultRpt(Pst* pst, RlcSchedResultRpt *schRep) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC: Memory allocation failed at packSchResultRep"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packSchResultRep"); return RFAILED; } if (pst->selector == ODU_SELECTOR_LWLC) @@ -177,7 +177,7 @@ uint8_t packRlcDlData(Pst* pst, RlcData *dlData) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nRLC: Memory allocation failed at packRlcDlData"); + DU_LOG("\nERROR --> RLC : Memory allocation failed at packRlcDlData"); return RFAILED; } @@ -245,7 +245,7 @@ uint8_t packRlcUlData(Pst* pst, RlcData *ulData) if (ODU_GET_MSG_BUF(pst->region, pst->pool, &mBuf) != ROK) { - DU_LOG("\nMAC : Memory allocation failed at packRlcUlData"); + DU_LOG("\nERROR --> MAC : Memory allocation failed at packRlcUlData"); return RFAILED; }