From: sphoorthi Date: Fri, 5 Feb 2021 12:17:40 +0000 (+0530) Subject: [JIRA ID - ODUHIGH-275] Part -4 classifying of logs of sch folder X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F00%2F5600%2F1;p=o-du%2Fl2.git [JIRA ID - ODUHIGH-275] Part -4 classifying of logs of sch folder Change-Id: I75753b18e8b24c3105fba1c5856c3f1b7bf4267c Signed-off-by: sphoorthi --- diff --git a/src/5gnrsch/rg_sch_dbm.c b/src/5gnrsch/rg_sch_dbm.c index 92dde46d9..801c192ad 100755 --- a/src/5gnrsch/rg_sch_dbm.c +++ b/src/5gnrsch/rg_sch_dbm.c @@ -31,9 +31,6 @@ /** @file rg_sch_dbm.c @brief This file contains the APIs exposed for the database handling of the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_FILE_ID=230; -static int RLOG_MODULE_ID=4096; /* header include files -- defines (.h) */ #include "common_def.h" #include "lrg.h" @@ -1312,7 +1309,7 @@ RgSchRntiLnk* rgSCHDbmGetRnti(RgSchCellCb *cellCb) if (!(cellCb->rntiDb.freeRnti)) { - RLOG_ARG1(L_ERROR,DBG_CELLID,cellCb->cellId,"RNTI exhausted count:%d", + DU_LOG("\nERROR --> SCH : RNTI exhausted count:%d", cellCb->rntiDb.count); return (NULLP); } @@ -1335,7 +1332,7 @@ RgSchRntiLnk* rgSCHDbmGetRnti(RgSchCellCb *cellCb) cellCb->rntiDb.count--; - printf("rgSCHDbmGetRnti::rntiLnk->rnti %u\n",rntiLnk->rnti); + DU_LOG("\nINFO --> SCH : rgSCHDbmGetRnti::rntiLnk->rnti %u\n",rntiLnk->rnti); return (rntiLnk); } /* rgSCHDbmGetRnti */ diff --git a/src/5gnrsch/rg_sch_l2m.c b/src/5gnrsch/rg_sch_l2m.c index d5668f1c0..4e2be55d0 100755 --- a/src/5gnrsch/rg_sch_l2m.c +++ b/src/5gnrsch/rg_sch_l2m.c @@ -182,8 +182,7 @@ uint32_t measTime cell->qciArray[qciVal].dlTotal_UeCount / sampOc; cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal; - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, - "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ", + DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ", qciVal,cell->qciArray[qciVal].dlTotal_UeCount, cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci); @@ -204,8 +203,7 @@ uint32_t measTime cell->qciArray[qciVal].dlTotal_UeCount / sampOc; cfm->numUeQciDlCfm.numActvUeQci[idx].qciValue = qciVal; - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, - "L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ", + DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM DL QCI %u TOTAL Count %lu Active UE %d ", qciVal,cell->qciArray[qciVal].dlTotal_UeCount, cfm->numUeQciDlCfm.numActvUeQci[idx].numActvUeQci); @@ -236,8 +234,7 @@ uint32_t measTime cell->qciArray[qciVal].ulTotal_UeCount/ sampOc; cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal; - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, - "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ", + DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ", qciVal,cell->qciArray[qciVal].ulTotal_UeCount, cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci); @@ -257,8 +254,7 @@ uint32_t measTime cell->qciArray[qciVal].ulTotal_UeCount/ sampOc; cfm->numUeQciUlCfm.numActvUeQci[idx].qciValue = qciVal; - RLOG_ARG3(L_DEBUG,DBG_CELLID,cell->cellId, - "L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ", + DU_LOG("\nDEBUG --> SCH : L2_MEAS:CFM UL QCI %d TOTAL Count %lu Active UE %d ", qciVal,cell->qciArray[qciVal].ulTotal_UeCount, cfm->numUeQciUlCfm.numActvUeQci[idx].numActvUeQci); @@ -516,8 +512,7 @@ RgSchErrInfo err if((rgSCHUtlAllocSBuf(inst, (Data **)&measCb, sizeof(RgSchL2MeasCb))) == RFAILED) { - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId,"rgSchL2mAllocMeasCb():" - "Allocation of RgSchL2MeasCb failed"); + DU_LOG("\nERROR --> SCH : Allocation of RgSchL2MeasCb failed"); return (NULLP); } memcpy(&measCb->measReq, measInfo, sizeof(LrgSchMeasReqInfo)); @@ -565,8 +560,7 @@ RgSchErrInfo err { RGSCHFILLERR(err, RGSCHERR_L2M_MEASREQ, RGSCHERR_SCH_ALLOC_FAILED); - RLOG_ARG0(L_ERROR,DBG_CELLID,cell->cellId, "rgSchL2mMeasReq():" - "Allocation of RgSchL2MeasCb failed"); + DU_LOG("\nERROR --> SCH : Allocation of RgSchL2MeasCb failed"); return RFAILED; } /*memcpy(&measCb->measReq, measInfo,\ diff --git a/src/5gnrsch/rg_sch_pwr.c b/src/5gnrsch/rg_sch_pwr.c index 23bcc2b19..fd58f6a94 100755 --- a/src/5gnrsch/rg_sch_pwr.c +++ b/src/5gnrsch/rg_sch_pwr.c @@ -32,9 +32,6 @@ @brief This module handles schedulers' power control functionality */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=188; /* header include files -- defines (.h) */ #include "common_def.h" #include "lrg.h" @@ -599,11 +596,9 @@ static Void rgSCHPwrPuschCntrl(RgSchCellCb *cell,RgSchUeCb *ue) } #endif } - RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId, - "UEID:%d Output Max Rb (%d), phVal (%d) AvailPwr (%d) ", + DU_LOG("\nDEBUG --> SCH : UEID:%d Output Max Rb (%d), phVal (%d) AvailPwr (%d) ", ue->ueId, maxRb, uePwr->phVal, availPwr); - RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId, - "UEID:%d pwrPerRb %d remPuschPwr %d", + DU_LOG("\nDEBUG --> SCH : UEID:%d pwrPerRb %d remPuschPwr %d", ue->ueId, uePwr->pwrPerRb, uePwr->remPuschPwr); @@ -1860,8 +1855,7 @@ Void rgSCHPwrUpdPhr(RgSchCellCb *cell,RgSchUeCb *ue,uint8_t phr,RgSchCmnAllocRec rgSCHPwrOnPuschPwrUpd(cell, ue); - RLOG_ARG4(L_DEBUG,DBG_UEID,ue->ueId, - "Output: Reported PHR[%d] cqi[%u] allocRb[%u] uePwr->pwrPerRb[%d]", + DU_LOG("\nDEBUG --> SCH : Output: Reported PHR[%d] cqi[%u] allocRb[%u] uePwr->pwrPerRb[%d]", uePwr->phVal, allocInfo->cqi, allocInfo->numRb, @@ -2345,31 +2339,25 @@ static S16 rgSCHPwrApplyUePwrCfg(RgSchCellCb *cell,RgSchUeCb *ue,RgrUeUlPwrCfg * } uePwr->pucchIdx = pucchIdx; #ifndef ALIGN_64BIT - RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId, - "PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d", + DU_LOG("\nDEBUG --> SCH : PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d", pucchRntiCb->cfgdUes.count,((uint32_t)pucchRntiCb->cfgdUes.first), ((uint32_t)pucchRntiCb->cfgdUes.last),ue->ueId); - RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId, - "UEID:%d isFmt3a(%u) ueNode(%ld)", + DU_LOG("\nDEBUG --> SCH : UEID:%d isFmt3a(%u) ueNode(%ld)", ue->ueId,pucchRntiCb->isFmt3a, pucchRntiCb->schdLnk.node); - RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId, - "toBeSchdUes(%ld %lu %lu) tpcRnti(%u)", + DU_LOG("\nDEBUG --> SCH : toBeSchdUes(%ld %lu %lu) tpcRnti(%u)", pucchRntiCb->toBeSchdUes.count, ((uint32_t)pucchRntiCb->toBeSchdUes.first), ((uint32_t)pucchRntiCb->toBeSchdUes.last), pucchRntiCb->tpcRnti); #else - RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId, - "PucchRntiCb cfgdUes(%ld %lu %lu) UEID:%d", + DU_LOG("\nDEBUG --> SCH : PucchRntiCb cfgdUes(%d %lu %lu) UEID:%d", pucchRntiCb->cfgdUes.count,((uint64_t)pucchRntiCb->cfgdUes.first), ((uint64_t)pucchRntiCb->cfgdUes.last),ue->ueId); - RLOG_ARG3(L_UNUSED,DBG_CELLID,cell->cellId, - "UEID:%d isFmt3a(%u) ueNode(%ld)", + DU_LOG("\nDEBUG --> SCH : UEID:%d isFmt3a(%u) ueNode(%ld)", ue->ueId,pucchRntiCb->isFmt3a, pucchRntiCb->schdLnk.node); - RLOG_ARG4(L_UNUSED,DBG_CELLID,cell->cellId, - "toBeSchdUes(%ld %lu %lu) tpcRnti(%u)", + DU_LOG("\nDEBUG --> SCH : toBeSchdUes(%d %lu %lu) tpcRnti(%u)", pucchRntiCb->toBeSchdUes.count, ((uint64_t)pucchRntiCb->toBeSchdUes.first), ((uint64_t)pucchRntiCb->toBeSchdUes.last), diff --git a/src/5gnrsch/rg_sch_tmr.c b/src/5gnrsch/rg_sch_tmr.c index 068e8b1c4..50d59bfc5 100755 --- a/src/5gnrsch/rg_sch_tmr.c +++ b/src/5gnrsch/rg_sch_tmr.c @@ -31,9 +31,6 @@ /** @file rg_sch_tmr.c @brief This module does processing related to timers for the scheduler. */ -static const char* RLOG_MODULE_NAME="MAC"; -static int RLOG_MODULE_ID=4096; -static int RLOG_FILE_ID=175; /* header include files -- defines (.h) */ #include "common_def.h" @@ -101,8 +98,7 @@ Void rgSCHTmrStartTmr(RgSchCellCb *cell,Ptr cb,S16 tmrEvnt,uint32_t tmrVal) { case RG_SCH_TMR_ACKNACK_REP: arg.timers = &(ue->ackNakRepCb.ackNakRepTmr); - RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx, - "Hit AckNackRep timer"); + DU_LOG("\nINFO --> SCH : Hit AckNackRep timer"); break; case RG_SCH_TMR_MEASGAP: arg.timers = &(ue->measGapCb.measGapTmr); @@ -158,8 +154,7 @@ Void rgSCHTmrStartTmr(RgSchCellCb *cell,Ptr cb,S16 tmrEvnt,uint32_t tmrVal) } #endif default: - RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx, - "rgSCHTmrStartTmr() Incorrect Timer event"); + DU_LOG("\nERROR --> SCH : rgSCHTmrStartTmr() Incorrect Timer event"); return; } @@ -272,8 +267,7 @@ Void rgSCHTmrStopTmr(RgSchCellCb *cell,S16 tmrEvnt,Ptr cb) #endif default: - RLOG_ARG0(L_ERROR,DBG_INSTID,cell->instIdx, - "rgSCHTmrStopTmr() Incorrect Timer event"); + DU_LOG("\nERROR --> SCH : rgSCHTmrStopTmr() Incorrect Timer event"); return; } @@ -343,7 +337,7 @@ Void rgSCHTmrProcTmr(Ptr cb,S16 tmrEvnt) /*TODO Needto handle TA Timer expiry for EMTC UE*/ if(TRUE == ue->isEmtcUe) { - RLOG0(L_INFO,"TA Timer Expiry is not handled for EMTC UE\n"); + DU_LOG("\nINFO --> SCH : TA Timer Expiry is not handled for EMTC UE\n"); break; } #endif @@ -385,8 +379,7 @@ Void rgSCHTmrProcTmr(Ptr cb,S16 tmrEvnt) default: if(ue) { - RLOG_ARG0(L_ERROR,DBG_INSTID,ue->cell->instIdx, - "rgSCHTmrProcTmr() Incorrect Timer event"); + DU_LOG("\nERROR --> SCH : rgSCHTmrProcTmr() Incorrect Timer event"); } return; } diff --git a/src/5gnrsch/sch_slot_ind.c b/src/5gnrsch/sch_slot_ind.c index bd3e642a2..44864f00b 100644 --- a/src/5gnrsch/sch_slot_ind.c +++ b/src/5gnrsch/sch_slot_ind.c @@ -155,7 +155,7 @@ uint8_t schFillBoGrantDlSchedInfo(SchCellCb *cell, DlSchedInfo *dlSchedInfo, DlM SCH_ALLOC(dlMsgAlloc, sizeof(DlMsgAlloc)); if(!dlMsgAlloc) { - DU_LOG("\nMAC: Memory Allocation failed for ded DL msg alloc"); + DU_LOG("\nERROR --> SCH : Memory Allocation failed for ded DL msg alloc"); return RFAILED; } memset(dlMsgAlloc, 0, sizeof(DlMsgAlloc)); @@ -282,7 +282,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) ret = schBroadcastAlloc(cell,dlBrdcstAlloc,slot); if(ret != ROK) { - DU_LOG("\nschBroadcastAlloc failed"); + DU_LOG("\nERROR --> SCH : schBroadcastAlloc failed"); return (ret); } } @@ -294,7 +294,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) SCH_ALLOC(rarAlloc, sizeof(RarAlloc)); if(!rarAlloc) { - DU_LOG("\nMAC: Memory Allocation failed for RAR alloc"); + DU_LOG("\nERROR --> SCH : Memory Allocation failed for RAR alloc"); return RFAILED; } @@ -322,7 +322,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) SCH_ALLOC(msg4Alloc, sizeof(DlMsgAlloc)); if(!msg4Alloc) { - DU_LOG("\nMAC: Memory Allocation failed for msg4 alloc"); + DU_LOG("\nERROR --> SCH : Memory Allocation failed for msg4 alloc"); return RFAILED; } @@ -369,7 +369,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) SCH_ALLOC(dciInfo, sizeof(DciInfo)); if(!dciInfo) { - DU_LOG("\nMAC: Memory Allocation failed for dciInfo alloc"); + DU_LOG("\nERROR --> SCH : Memory Allocation failed for dciInfo alloc"); return RFAILED; } memset(dciInfo,0,sizeof(DciInfo)); @@ -396,7 +396,7 @@ uint8_t schProcessSlotInd(SlotIndInfo *slotInd, Inst schInst) ret = sendDlAllocToMac(&dlSchedInfo, schInst); if(ret != ROK) { - DU_LOG("\nSending DL Broadcast allocation from SCH to MAC failed"); + DU_LOG("\nERROR --> SCH : Sending DL Broadcast allocation from SCH to MAC failed"); return (ret); }