X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrrlc%2Frlc_layer_mgr.c;h=304e60e02649bdbe98fda6194edd8017c90965ca;hb=65780c0e397afca1bc67923de1a19a420a0e86f3;hp=9143f52a7b0e9f556a08c03befce9781a2163f2f;hpb=284fc2e85cb5008061a7f8c6d07947a1c6209432;p=o-du%2Fl2.git diff --git a/src/5gnrrlc/rlc_layer_mgr.c b/src/5gnrrlc/rlc_layer_mgr.c index 9143f52a7..304e60e02 100755 --- a/src/5gnrrlc/rlc_layer_mgr.c +++ b/src/5gnrrlc/rlc_layer_mgr.c @@ -173,10 +173,12 @@ static S16 rlcLmmGenCfg(RlcCb *gCb,RlcGenCfg *cfg) rlcTqCp->nxtEnt = 0; gCb->rlcThpt.inst = gCb->init.inst; - gCb->rlcThpt.thptTmr.tmrEvnt = TMR_NONE; - gCb->rlcThpt.numActvUe = 0; - memset(gCb->rlcThpt.thptPerUe, 0, MAX_NUM_UE * sizeof(RlcThptPerUe)); + gCb->rlcThpt.ueTputInfo.ueThptTmr.tmrEvnt = TMR_NONE; + gCb->rlcThpt.ueTputInfo.numActvUe = 0; + memset(gCb->rlcThpt.ueTputInfo.thptPerUe, 0, MAX_NUM_UE * sizeof(RlcThptPerUe)); + gCb->rlcThpt.snssaiTputInfo.snssaiThptTmr.tmrEvnt = TMR_NONE; + if(gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { RLC_ALLOC(gCb,gCb->u.dlCb, sizeof (RlcDlCb)); @@ -394,13 +396,20 @@ static S16 rlcLmmGenCfg(RlcCb *gCb,RlcGenCfg *cfg) if(gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { /* Starting timer to print throughput */ - if((rlcChkTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR)) == FALSE) + if((rlcChkTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_UE_THROUGHPUT_TMR)) == FALSE) { - DU_LOG("\nINFO --> RLC_DL : Starting Throughput timer"); - rlcStartTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_THROUGHPUT_TMR); + DU_LOG("\nINFO --> RLC_DL : Starting UE Throughput timer"); + rlcStartTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_UE_THROUGHPUT_TMR); } } + /* Starting timer to print throughput */ + if((rlcChkTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_SNSSAI_THROUGHPUT_TMR)) == FALSE) + { + DU_LOG("\nINFO --> RLC_DL : Starting SNSSAI Throughput timer"); + rlcStartTmr(gCb, (PTR)(&gCb->rlcThpt), EVENT_RLC_SNSSAI_THROUGHPUT_TMR); + } + return (LCM_REASON_NOT_APPL); } @@ -587,7 +596,7 @@ uint8_t RlcMiRlcConfigReq (Pst *pst,RlcMngmt *cfg) return (RFAILED); } - DU_LOG("\nDEBUG --> RLC : RlcMiRlcConfigReq elmId(%d)", cfg->hdr.elmId.elmnt); + DU_LOG("\nDEBUG --> RLC : RlcMiRlcConfigReq elmId(%d)", cfg->hdr.elmId.elmnt); switch(cfg->hdr.elmId.elmnt) { @@ -1606,14 +1615,16 @@ static S16 rlcLmmShutdown(RlcCb *gCb) } } } - + if(gCb->genCfg.rlcMode == LKW_RLC_MODE_DL) { rlcDbmDlShutdown(gCb); + rlcDelTputSnssaiList(gCb, DIR_DL); } else { rlcDbmUlShutdown(gCb); + rlcDelTputSnssaiList(gCb, DIR_UL); } rlcLmmCleanGblRsrcs(gCb);