X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=583b6c988cfa1252478fa4385f11b42101dc2318;hb=b9a6860b8d95b57307e3e30b95642c83a762241e;hp=877dd56a18c6f02383f86f069438451dab572875;hpb=762bc0a2a50222d74b01d9a88071bfaf5d90979b;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 877dd56a1..583b6c988 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -503,7 +503,19 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { SS_POOL_DYNAMIC, MT_POOL_4_DSIZE }, { SS_POOL_STATIC, 0 } } + }, + { + SS_DFLT_REGION + 6, SS_MAX_POOLS_PER_REG - 1, + { + { SS_POOL_DYNAMIC, MT_POOL_0_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_1_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_2_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_3_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_4_DSIZE }, + { SS_POOL_STATIC, 0 } + } } + #endif /* SS_LOCKLESS_MEMORY */ }; /* mt003.301 Modifications - File Based task registration made @@ -586,11 +598,23 @@ MtDynMemCfg mtDynMemoCfg = {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } + }, + { + SS_DFLT_REGION + 6, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + { + /* block size, no. of blocks, Upper threshold, lower threshold */ + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} + } } #if ((defined (SPLIT_RLC_DL_TASK)) && (!defined (L2_L3_SPLIT))) , { - SS_DFLT_REGION + 4, /* region id */ + SS_DFLT_REGION + 7, /* region id */ MT_MAX_BKTS, /* number of buckets */ { /* block size, no. of blocks, Upper threshold, lower threshold */ @@ -729,6 +753,18 @@ MtMemCfg mtMemoCfg = {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ } }, + { + SS_DFLT_REGION + 5, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + MT_HEAP_SIZE, /* heap size */ + { + {MT_BKT_0_DSIZE, MT_BKT_0_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_1_DSIZE, MT_BKT_1_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_2_DSIZE, MT_BKT_2_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ + } + }, { SS_DFLT_REGION + 5, /* region id */ MT_MAX_BKTS, /* number of buckets */ @@ -1691,17 +1727,17 @@ S16 SAllocateStaticMem() S16 ssdInitMem(void) { /* mt018.201 - added local variable */ - uint8_t i; - uint16_t j; - uint8_t k; - MtRegCfg *region; + uint8_t i =0; + uint16_t j =0; + uint8_t k =0; + MtRegCfg *region = NULLP; Txt errMsg[256] = {'\0'}; #ifdef SS_LOCKLESS_MEMORY - CmMmDynRegCb *dynRegCb; + CmMmDynRegCb *dynRegCb =0; #ifdef SS_USE_ICC_MEMORY #else - CmMmGlobRegCb *globReg; - Size memSize; + CmMmGlobRegCb *globReg = NULLP; + Size memSize =0; #endif #endif /* SS_LOCKLESS_MEMORY */ @@ -1811,7 +1847,7 @@ S16 ssdInitMem(void) #endif /* SS_LOCKLESS_MEMORY */ #ifdef T2K_MEM_LEAK_DBG - uint8_t reg; + uint8_t reg =0; /* Initailize mem leak tool memorys for debguing */ regMemLeakInfo.numActvRegions=0; for(reg=0; reg vAddr); - free(mtCMMRegCb[k]); - free(mtCMMRegCfg[k]); - } - free(mtCMMRegCb[i]); - return RFAILED; - } + { + for (k = 0; k < i; k++) + { + cmMmRegDeInit(mtCMMRegCb[k]); + free(mtCMMRegCfg[k]->vAddr); + free(mtCMMRegCb[k]); + free(mtCMMRegCfg[k]); + } + free(mtCMMRegCb[i]); + return RFAILED; + } /* allocate space for the region */ @@ -1980,7 +2016,6 @@ S16 ssdInitMem(void) cmInitMemLeakMdl(); #endif /* SS_MEM_LEAK_STS */ - return ROK; } @@ -4615,7 +4650,7 @@ Void *mtTskHdlr Ptr tskPtr /* pointer to task entry */ ) { - S16 ret; + S16 ret = ROK; SsSTskEntry *sTsk; /* get out the system task entry from the parameter */ @@ -4676,15 +4711,15 @@ S16 mtTskHdlMsg SsSTskEntry *sTsk ) { - S16 i; - S16 ret; - SsIdx idx; - SsTTskEntry *tTsk; - Buffer *mBuf; + S16 i =0; + S16 ret =0; + SsIdx idx =0; + SsTTskEntry *tTsk=NULLP; + Buffer *mBuf=NULLP; #ifdef SS_PERF - Buffer *mBuf2; + Buffer *mBuf2=NULLP; #endif - SsMsgInfo *mInfo; + SsMsgInfo *mInfo=NULLP; Pst nPst; /* mt028.201: modification: multiple procs support related changes */ #ifndef SS_MULTIPLE_PROCS @@ -4694,8 +4729,8 @@ SsSTskEntry *sTsk /* mt015.301 Initialized the timer activation functions with NULLP */ PFS16 tmrActvFn = NULLP; #else - PAIFTMRS16 tmrActvFn; - uint16_t procIdIdx; + PAIFTMRS16 tmrActvFn =NULLP; + uint16_t procIdIdx =0; #endif /* SS_MULTIPLE_PROCS */ /* mt003.301 Modifications */ #ifdef SS_THREAD_PROFILE