X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Frlc_utils.h;h=14a5e0dec6c584df0244cc3ea55c488cd8baaa8a;hb=refs%2Fchanges%2F15%2F9315%2F5;hp=0eb9b78bd0b67133d099dfa2bc8d4772ddae3860;hpb=70e1fb5996d93ef4973ffb654ee6a66228e9031c;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/rlc_utils.h b/src/5gnrrlc/rlc_utils.h index 0eb9b78bd..14a5e0dec 100755 --- a/src/5gnrrlc/rlc_utils.h +++ b/src/5gnrrlc/rlc_utils.h @@ -39,6 +39,7 @@ extern "C" { #endif /* __cplusplus */ #include "du_log.h" +#include "du_app_rlc_inf.h" #define EKWxxx 1 @@ -103,12 +104,22 @@ extern "C" { * Memory related Defines ******************************************************************************/ /* Allocate function */ +#ifdef ODU_MEMORY_DEBUG_LOG +#define RLC_MEM_LOG(_macro, _file, _line, _func, _size, _datPtr)\ +{\ + printf("\n%s=== %s +%d, %s, %lu, %p", \ + _macro, _file, _line, _func, (uint64_t)_size, _datPtr); \ +} +#else +#define RLC_MEM_LOG(_macro, _file, _line, _func, _size, _dataPtr) {} +#endif #define RLC_ALLOC(_cb,_buf, _size) \ { \ if (SGetSBuf(_cb->init.region, _cb->init.pool, (Data **)&_buf, \ (Size) _size) == ROK) \ { \ + RLC_MEM_LOG("RLC_ALLOC", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ memset((_buf), 0, _size); \ } \ else \ @@ -121,6 +132,7 @@ extern "C" { { \ if (_buf != NULLP) \ { \ + RLC_MEM_LOG("RLC_FREE", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ (Void) SPutSBuf(_cb->init.region, _cb->init.pool, \ (Data *) _buf, (Size) _size); \ _buf = NULLP; \ @@ -130,7 +142,8 @@ extern "C" { #define RLC_FREE_SHRABL_BUF(_region, _pool,_buf, _size) \ { \ if (_buf != NULLP) \ - { \ + { \ + RLC_MEM_LOG("RLC_FREE_SHRABL_BUF", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ (Void) SPutStaticBuffer(_region, _pool, \ (Data *) _buf, (Size) _size, 0); \ _buf = NULLP; \ @@ -139,15 +152,25 @@ extern "C" { #define RLC_FREE_SHRABL_BUF_WC(_region, _pool,_buf, _size) \ { \ + if (_buf != NULLP){\ + RLC_MEM_LOG("RLC_FREE_SHRABL_BUF_WC", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ (Void) SPutStaticBuffer(_region, _pool, \ (Data *) _buf, (Size) _size, 0); \ - _buf = NULLP; \ + _buf = NULLP; \ + }\ } #define RLC_ALLOC_SHRABL_BUF_WC(_region, _pool,_buf, _size) \ { \ - SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ - (Size) _size, 0); \ + if(SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ + (Size) _size, 0)==ROK) \ + {\ + RLC_MEM_LOG("RLC_ALLOC_SHRABL_BUF_WC", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ + }\ + else\ + {\ + (_buf) = NULLP;\ + }\ } #define RLC_ALLOC_SHRABL_BUF(_region, _pool,_buf, _size) \ @@ -155,6 +178,7 @@ extern "C" { if (SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ (Size) _size, 0) == ROK) \ { \ + RLC_MEM_LOG("RLC_ALLOC_SHRABL_BUF", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ memset((_buf), 0, _size); \ } \ else \ @@ -164,13 +188,19 @@ extern "C" { } #define RLC_ALLOC_WC(_cb,_buf, _size) \ - SGetSBuf(_cb->init.region, _cb->init.pool, (Data **)&_buf, (Size) _size) +{\ + if(SGetSBuf(_cb->init.region, _cb->init.pool, (Data **)&_buf, (Size) _size) == ROK)\ + {\ + RLC_MEM_LOG("RLC_ALLOC_WC", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ + }\ +} #define RLC_REMOVE_SDU(_cb,_sduQ,_sdu) \ { \ if(_sdu->mBuf) \ { \ - SPutMsg(_sdu->mBuf); \ + RLC_MEM_LOG("RLC_REMOVE_SDU", __FILE__, __LINE__, __FUNCTION__, _sdu->sduSz, _sdu->mBuf);\ + ODU_PUT_MSG_BUF(_sdu->mBuf); \ } \ cmLListDelFrm(_sduQ,&_sdu->lstEnt); \ RLC_FREE(_cb,_sdu, sizeof(RlcSdu)); \ @@ -181,6 +211,7 @@ extern "C" { { \ if (_buf != NULLP) \ { \ + RLC_MEM_LOG("RLC_PST_FREE", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ (Void) SPutSBuf(_region, _pool, \ (Data *) _buf, (Size) _size); \ _buf = NULLP; \ @@ -230,16 +261,18 @@ extern "C" { { \ if (_buf != NULLP) \ { \ + RLC_MEM_LOG("RLC_SHRABL_STATIC_BUF_FREE", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ (Void) SPutStaticBuffer(_region, _pool, \ - (Data *) _buf, (Size) _size, 0); \ + (Data *) _buf, (Size) _size, 0); \ _buf = NULLP; \ } \ } #define RLC_SHRABL_STATIC_BUF_ALLOC(_region, _pool, _buf, _size) \ { \ - SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ - (Size) _size, 0); \ + SGetStaticBuffer(_region, _pool, (Data **)&_buf, \ + (Size) _size, 0); \ + RLC_MEM_LOG("RLC_SHRABL_STATIC_BUF_ALLOC", __FILE__, __LINE__, __FUNCTION__, _size, _buf);\ } #endif @@ -421,10 +454,11 @@ extern "C" { #define RLC_MAX_UM_TMR 1 #define RLC_MAX_AM_TMR 3 #define RLC_MAX_THPT_TMR 1 +#define RLC_MAX_UE_TMR 1 /* Timer events */ #define EVENT_RLC_UMUL_REASSEMBLE_TMR 1 -#define EVENT_RLC_AMUL_REASSEMBLE_TMR 2 +#define EVENT_RLC_AMUL_REASSEMBLE_TMR 2 #define EVENT_RLC_AMUL_STA_PROH_TMR 3 #define EVENT_RLC_AMDL_POLL_RETX_TMR 4 #define EVENT_RLC_WAIT_BNDCFM 5 @@ -432,7 +466,12 @@ extern "C" { #ifdef LTE_L2_MEAS #define EVENT_RLC_L2_TMR 6 #endif /* LTE_L2_MEAS */ -#define EVENT_RLC_THROUGHPUT_TMR 7 +#define EVENT_RLC_UE_THROUGHPUT_TMR 7 +#define EVENT_RLC_UE_DELETE_TMR 8 +#define EVENT_RLC_SNSSAI_THROUGHPUT_TMR 9 + +/* Wait time for RLC Timers */ +#define RLC_UE_DELETE_WAIT_TIME 5 /*in milliseconds */ /******************************************************************************* * DBM Defines @@ -1077,7 +1116,6 @@ do \ #define RLC_DL_INST 1 #define PDCP_SN 1 -#define RLC_REASSEMBLY_TMR_BASE 5 /* Used to calculate timer value from enum values */ /* Fill Pst structure for sending msg from RLC to DUAPP */ #define FILL_PST_RLC_TO_DUAPP(_pst, _srcInst, _event) \ @@ -1672,20 +1710,40 @@ typedef struct rlcUlCb typedef struct rlcThptPerUe { - uint16_t ueIdx; + uint16_t ueId; uint64_t dataVol; }RlcThptPerUe; +typedef struct rlcTptPerSnssai +{ + Snssai *snssai; + uint64_t dataVol; + double tpt; +}RlcTptPerSnssai; + + +typedef struct rlcSnssaiTputInfo +{ + CmTimer snssaiThptTmr; /* Throughput Timer */ + CmLListCp *dlTputPerSnssaiList; + CmLListCp *ulTputPerSnssaiList; +}RlcSnssaiTputInfo; + +typedef struct rlcUeTputInfo +{ + CmTimer ueThptTmr; /* Throughput Timer */ + uint8_t numActvUe; /* Number of Active UEs */ + RlcThptPerUe thptPerUe[MAX_NUM_UE]; /* Throughput calculated per UE */ +}RlcUeTputInfo; /** * @brief Structure to hold information about throughput at RLC * */ typedef struct rlcThpt { - Inst inst; /* RLC instance */ - CmTimer thptTmr; /* Throughput Timer */ - uint8_t numActvUe; /* Number of Active UEs */ - RlcThptPerUe thptPerUe[MAX_NUM_UE]; /* Throughput calculated per UE */ + Inst inst; /* RLC instance */ + RlcUeTputInfo ueTputInfo; + RlcSnssaiTputInfo snssaiTputInfo; }RlcThpt; /** @@ -1723,6 +1781,7 @@ typedef struct rlcCb RlcCb *rlcCb[MAX_RLC_INSTANCES]; /*!< RLC global control block */ +CmLListCp *arrTputPerSnssai[DIR_BOTH]; /*Stores the address of Througput LL*/ /**************************************************************************** * Declarations ***************************************************************************/ @@ -1738,6 +1797,19 @@ void rlcStopTmr ARGS((RlcCb *gCb, PTR cb, uint8_t tmrType)); bool rlcChkTmr ARGS((RlcCb *gCb,PTR cb, S16 tmrEvnt)); +void rlcUeThptTmrExpiry(PTR cb); + +uint8_t rlcUeDeleteTmrExpiry(PTR cb); + +void rlcSnssaiThptTmrExpiry(PTR cb); +RlcTptPerSnssai* rlcHandleSnssaiTputlist(RlcCb *gCb, Snssai *snssai,\ + ActionTypeLL action, Direction dir); +uint8_t rlcCalculateTputPerSnssai(CmLListCp *snssaiList, Direction dir); +uint8_t rlcDelTputSnssaiList(RlcCb *gCb, Direction dir); +uint8_t BuildSliceReportToDu(uint8_t snssaiCnt); +bool rlcFindSliceEntry(SliceIdentifier snssaiVal, uint8_t *snssaiIdx,\ + SlicePmList *sliceStats); + #ifdef LTE_L2_MEAS Void rlcLmmSendAlarm ARGS (( RlcCb *gCb, uint16_t category,