X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_tenb_stats.c;h=244bff9cffb67ae9ee5b182cc53c6e2548766f9f;hb=05d098e6b94f629a932caaff404f2b703b123852;hp=538d926b3c8d4ea61b749152680edf142cb8eff5;hpb=9c8b78da0f4ef42dae5e30a3061463b81327e7a0;p=o-du%2Fl2.git diff --git a/src/cm/cm_tenb_stats.c b/src/cm/cm_tenb_stats.c index 538d926b3..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) */ @@ -68,23 +68,23 @@ #include "cm_tenb_stats.x" /* Total EnodeB Stats declarations */ #ifdef TENB_STATS -PRIVATE Void TSInfUtlPackUeInfo ARGS(( +static Void TSInfUtlPackUeInfo ARGS(( Buffer *mBuf, TSInfL2UeStats *stats )); -PRIVATE Void TSInfUtlPackCellInfo ARGS(( +static Void TSInfUtlPackCellInfo ARGS(( Buffer *mBuf, TSInfL2CellStats *stats )); -PRIVATE Void TSInfUtlUnpkUeInfo ARGS(( +static Void TSInfUtlUnpkUeInfo ARGS(( Buffer *mBuf, TSInfL2UeStats *stats )); -PRIVATE Void TSInfUtlUnpkCellInfo ARGS(( +static Void TSInfUtlUnpkCellInfo ARGS(( Buffer *mBuf, TSInfL2CellStats *stats )); -PRIVATE Buffer* TSInfUtlAllocMsg ARGS(( +static Buffer* TSInfUtlAllocMsg ARGS(( Pst *pst )); @@ -100,17 +100,7 @@ PRIVATE Buffer* TSInfUtlAllocMsg ARGS(( * * */ -#ifdef ANSI -PRIVATE Void TSInfTrigL2Stats -( - Region region, - Pool pool -) -#else -PRIVATE Void TSInfTrigL2Stats(region, pool) - Region region; - Pool pool; -#endif +static Void TSInfTrigL2Stats(Region region,Pool pool) { Buffer* pBuf; Pst pst = {0}; @@ -128,7 +118,7 @@ PRIVATE Void TSInfTrigL2Stats(region, pool) pst.event = TENBSTATSINIT; SPstTsk(&pst, pBuf); - RETVOID; + return; } /* @@ -143,58 +133,30 @@ PRIVATE Void TSInfTrigL2Stats(region, pool) * * */ -#ifdef ANSI -Void TSInfTrigStats -( - Region region, - Pool pool -) -#else -Void TSInfTrigStats(region, pool) - Region region; - Pool pool; -#endif +Void TSInfTrigStats(Region region,Pool pool) { //TODO TSInfTrigL2Stats(region, pool); - RETVOID; + return; } -#ifdef ANSI -PRIVATE Buffer* TSInfUtlAllocMsg -( - Pst *pst -) -#else -PRIVATE Buffer* TSInfUtlAllocMsg(pst) - Pst *pst; -#endif +static Buffer* TSInfUtlAllocMsg(Pst *pst) { Buffer *mBuf; if (SGetMsg(pst->region, pst->pool, &mBuf) != ROK) { - printf("\n MBuf Allocation failed\n"); + DU_LOG("\nERROR --> RLC : MBuf Allocation failed\n"); } return (mBuf); } -#ifdef ANSI -PRIVATE Void TSInfUtlPackUeInfo -( - Buffer *mBuf, - TSInfL2UeStats *stats -) -#else -PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2UeStats *stats; -#endif +static Void TSInfUtlPackUeInfo(Buffer *mBuf,TSInfL2UeStats *stats) { S32 i; - U32 k; + uint32_t k; CMCHKPK(oduUnpackUInt32, stats->persistent.numDeactivation, mBuf); @@ -259,20 +221,10 @@ PRIVATE Void TSInfUtlPackUeInfo(mBuf, stats) CMCHKPK(oduUnpackUInt32, stats->nonPersistent.sch[k].dlTxOccns, mBuf); } CMCHKPK(oduUnpackUInt32, stats->rnti, mBuf); - RETVOID; + return; } -#ifdef ANSI -PRIVATE Void TSInfUtlPackCellInfo -( - Buffer *mBuf, - TSInfL2CellStats *stats -) -#else -PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2CellStats *stats; -#endif +static Void TSInfUtlPackCellInfo(Buffer *mBuf,TSInfL2CellStats *stats ) { S32 i,j; @@ -375,23 +327,13 @@ PRIVATE Void TSInfUtlPackCellInfo(mBuf, stats) CMCHKPK(oduUnpackUInt32, stats->cellId, mBuf); - RETVOID; + return; } -#ifdef ANSI -PRIVATE Void TSInfUtlUnpkUeInfo -( - Buffer *mBuf, - TSInfL2UeStats *stats -) -#else -PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2UeStats *stats; -#endif +static Void TSInfUtlUnpkUeInfo(Buffer *mBuf, TSInfL2UeStats *stats ) { S32 i; - U32 k; + uint32_t k; CMCHKUNPK(oduPackUInt32, &stats->rnti, mBuf); @@ -457,20 +399,10 @@ PRIVATE Void TSInfUtlUnpkUeInfo(mBuf, stats) CMCHKUNPK(oduPackUInt32, &stats->persistent.numActivation, mBuf); CMCHKUNPK(oduPackUInt32, &stats->persistent.numDeactivation, mBuf); - RETVOID; + return; } -#ifdef ANSI -PRIVATE Void TSInfUtlUnpkCellInfo -( - Buffer *mBuf, - TSInfL2CellStats *stats -) -#else -PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) - Buffer *mBuf; - TSInfL2CellStats *stats; -#endif +static Void TSInfUtlUnpkCellInfo(Buffer *mBuf,TSInfL2CellStats *stats ) { S32 i,j; @@ -573,22 +505,10 @@ PRIVATE Void TSInfUtlUnpkCellInfo(mBuf, stats) CMCHKUNPK(oduPackUInt32, &stats->rlc.maxRlcDrbRetxFail, mBuf); CMCHKUNPK(oduPackUInt32, &stats->rlc.reOdrTmrExp, mBuf); - RETVOID; + return; } -#ifdef ANSI -Void TSInfPkSndL2UeStats -( - Pst *pst, - SuId suId, - TSInfL2UeStats *stats -) -#else -Void TSInfPkSndL2UeStats(pst, suId, stats) - Pst *pst; - SuId suId; - TSInfL2UeStats *stats; -#endif +Void TSInfPkSndL2UeStats(Pst *pst,SuId suId,TSInfL2UeStats *stats) { Buffer *mBuf; @@ -598,72 +518,34 @@ Void TSInfPkSndL2UeStats(pst, suId, stats) SPkS16(suId, mBuf); pst->event = (Event) EVTTENBL2UESTATS; SPstTsk(pst, mBuf); - RETVOID; + return; } -#ifdef ANSI -Void TSInfUnpkL2UeStats -( - TSInfL2UeStatsInd func, - Pst *pst, - Buffer *mBuf -) -#else -Void TSInfUnpkL2UeStats(func, pst, mBuf) - TSInfL2UeStatsInd func; - Pst *pst; - Buffer *mBuf; -#endif +Void TSInfUnpkL2UeStats(TSInfL2UeStatsInd func, Pst *pst,Buffer *mBuf) { SuId suId; TSInfL2UeStats stats; - SUnpkS16(&suId, mBuf); TSInfUtlUnpkUeInfo(mBuf, &stats); SPutMsg(mBuf); (*func)(pst, suId, &stats); - RETVOID; + return; } -#ifdef ANSI -Void TSInfPkSndL2CellStats -( - Pst *pst, - SuId suId, - TSInfL2CellStats *stats -) -#else -Void TSInfPkSndL2CellStats(pst, suId, stats) - Pst *pst; - SuId suId; - TSInfL2Cellstats *stats; -#endif +Void TSInfPkSndL2CellStats(Pst *pst,SuId suId,TSInfL2CellStats *stats ) { Buffer *mBuf; - mBuf = TSInfUtlAllocMsg(pst); TSInfUtlPackCellInfo(mBuf, stats); SPkS16(suId, mBuf); pst->event = (Event) EVTTENBL2CELLSTATS; SPstTsk(pst, mBuf); - RETVOID; + return; } -#ifdef ANSI -Void TSInfUnpkL2CellStats -( - TSInfL2CellStatsInd func, - Pst *pst, - Buffer *mBuf -) -#else -Void TSInfUnpkL2CellStats(func, pst, mBuf) - TSInfL2CellStatsInd func; - Pst *pst; - Buffer *mBuf; -#endif +Void TSInfUnpkL2CellStats(TSInfL2CellStatsInd func,Pst *pst,Buffer *mBuf) { SuId suId; TSInfL2CellStats stats; @@ -673,7 +555,7 @@ Void TSInfUnpkL2CellStats(func, pst, mBuf) TSInfUtlUnpkCellInfo(mBuf, &stats); SPutMsg(mBuf); (*func)(pst, suId, &stats); - RETVOID; + return; } #endif /* TENB_STATS */