X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_mem.c;h=6bda4fb9946a63fe6dc78b5b3a4235aa53ceff95;hb=65443172dd60a6ea312bd3a15959dbf54ad7f045;hp=41a6843f569f2c49a8ede49ad755e7d19e96a90a;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index 41a6843f5..6bda4fb99 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -114,10 +114,10 @@ The following functions are provided in this file. #ifdef SS_LIGHT_MEM_LEAK_STS MemLeakCb gmemLkCb; - U32 queueIndxAllocCnt =0; - U32 queueIndxFreeCnt =0; - U32 allocQueueFullCnt =0; - U32 allocQueueEmptyCnt =0; + uint32_t queueIndxAllocCnt =0; + uint32_t queueIndxFreeCnt =0; + uint32_t allocQueueFullCnt =0; + uint32_t allocQueueEmptyCnt =0; #endif /* local defines */ @@ -135,105 +135,105 @@ The following functions are provided in this file. #endif #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ -PUBLIC U32 memFreeCount=0; -PUBLIC U32 cmFreeCaller[4]={0}; -PUBLIC U32 cmAllocCaller[4]={0}; -PUBLIC Data *startPtr256=NULLP; -PUBLIC Data *startPtr128=NULLP; -PUBLIC U32 cmMemInfo128[100000][2]={0, 0}; -PUBLIC U32 cmMemInfo256[100000][2]={0, 0}; -PUBLIC Data *startPtr512=NULLP; -PUBLIC Data *startPtr768=NULLP; -PUBLIC Data *startPtr1664=NULLP; -PUBLIC Data *startPtr4800=NULLP; -PUBLIC Data *startPtr9920=NULLP; -PUBLIC Size regMemSize=0; +uint32_t memFreeCount=0; +uint32_t cmFreeCaller[4]={0}; +uint32_t cmAllocCaller[4]={0}; +Data *startPtr256=NULLP; +Data *startPtr128=NULLP; +uint32_t cmMemInfo128[100000][2]={0, 0}; +uint32_t cmMemInfo256[100000][2]={0, 0}; +Data *startPtr512=NULLP; +Data *startPtr768=NULLP; +Data *startPtr1664=NULLP; +Data *startPtr4800=NULLP; +Data *startPtr9920=NULLP; +Size regMemSize=0; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 //extern CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, - U32 memType, U32 line, U8 *fileName, U8 entId, Bool hstReg)); -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, U32 memType, U32 line, U8 *fileName, U8 entId, Bool hstReg)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, + uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType, uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); /*cm_mem_c_001.main_20-added new functionto allocate memory from new region*/ #else -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, - U32 line, U8 *fileName, U8 entId, Bool hstReg)); -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, - U32 line, U8 *fileName, U8 entId, Bool hstReg)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, + uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, + uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, U32 line, - U8 *fileName, U8 entId, Bool hstReg)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t line, + uint8_t *fileName, uint8_t entId, Bool hstReg)); -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size, - U32 line, U8 *fileName, U8 entId, Bool hstReg)); +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size, + uint32_t line, uint8_t *fileName, uint8_t entId, Bool hstReg)); #else /* no histogram support */ /* cm_mem_c_001.main_12 - prototype is changed to accept memType(static/dynamic) */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, U32 memType)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size, uint32_t memType)); #else #ifndef USE_PURE -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); +static S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); #endif/*USE_PURE*/ #endif /* SSI_DEBUG_LEVEL1 */ #ifndef USE_PURE -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); +static S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); #endif/*USE_PURE*/ /* cm_mem_c_001.main_15 :Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, U32 memType, U32 lineNo,U8 *funcName )); -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, U32 lineNo, U8* funcName)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType, uint32_t lineNo,uint8_t *funcName )); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, uint32_t lineNo, uint8_t* funcName)); #else /*SS_LIGHT_MEM_LEAK_STS */ #if (defined(SSI_DEBUG_LEVEL1) || defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, U32 memType)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, uint32_t memType)); #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, char* file, U32 line)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr, char* file, uint32_t line)); #else -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr)); +static S16 cmAlloc ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); #endif #endif /* SSI_DEBUG_LEVEL1 */ #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, char* file, U32 line)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, char* file, uint32_t line)); #else -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); #endif #endif /* SS_HISTOGRAM_SUPPORT */ #endif /*SS_LIGHT_MEM_LEAK_STS*/ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef SS_FAP -PRIVATE S16 cmAllocWL ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr)); -PRIVATE S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); +static S16 cmAllocWL ARGS((Void *regionCb, Size *size, uint32_t flags, Data **ptr)); +static S16 cmFreeWL ARGS((Void *regionCb, Data *ptr, Size size)); #endif -PRIVATE S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); +static S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); -PRIVATE Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); -PRIVATE Void cmMmBktInit ARGS((Data **memAddr, CmMmRegCb *regCb, - CmMmRegCfg *cfg, U16 bktIdx, U16 *lstMapIdx)); +static Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); +static Void cmMmBktInit ARGS((Data **memAddr, CmMmRegCb *regCb, + CmMmRegCfg *cfg, uint16_t bktIdx, uint16_t *lstMapIdx)); /* cm_mem_c_001.main_12 - addition of protoypes for sanity check and hash list functions */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmMmBktSanityChk ARGS((CmMmBkt *bkt)); -PRIVATE S16 cmMmHeapSanityChk ARGS((CmMmHeapCb *heapCb)); -PRIVATE S16 cmMmHashFunc ARGS((CmMmHashListCp *hashListCp, U32 key, U16 *idx )); -PRIVATE S16 cmMmHashListInit ARGS((CmMmHashListCp *hashListCp, U16 nmbBins, +static S16 cmMmBktSanityChk ARGS((CmMmBkt *bkt)); +static S16 cmMmHeapSanityChk ARGS((CmMmHeapCb *heapCb)); +static S16 cmMmHashFunc ARGS((CmMmHashListCp *hashListCp, uint32_t key, uint16_t *idx )); +static S16 cmMmHashListInit ARGS((CmMmHashListCp *hashListCp, uint16_t nmbBins, Region region, Pool pool)); -PRIVATE S16 cmMmHashListDeinit ARGS((CmMmHashListCp *hashListCp, Region region, Pool pool)); -PRIVATE S16 cmMmHashListInsert ARGS((CmMmHashListCp *hashListCp, U32 key)); +static S16 cmMmHashListDeinit ARGS((CmMmHashListCp *hashListCp, Region region, Pool pool)); +static S16 cmMmHashListInsert ARGS((CmMmHashListCp *hashListCp, uint32_t key)); #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15 : Addtions */ #ifdef SS_HISTOGRAM_SUPPORT -PRIVATE S16 cmHstGrmAllocInsert ARGS((CmHstGrmHashListCp *hashListCp, U32 blkSz, U32 *reqSz, U32 line, U8 *fileName, U8 entId)); -PRIVATE S16 cmHstGrmFreeInsert ARGS((CmHstGrmHashListCp* hashListCp, U32 blkSz, U32 line, U8 *fileName, U8 entId)); -PRIVATE S16 cmHstGrmHashListInit ARGS((CmHstGrmHashListCp *hashListCp)); -PRIVATE S16 cmHstGrmHashListDeInit ARGS((CmHstGrmHashListCp *hashListCp)); -PRIVATE S16 cmHstGrmGetHashIdxAndKey ARGS((U8 *fileName, U32 line, U32 *binIdx, U32 *key)); -PRIVATE S16 cmHstGrmFindEntry ARGS((CmHstGrmHashListCp *hashListCp, U32 key, U32 *binIdx, CmMemEntries **entry)); -PRIVATE S16 cmHstGrmFillEntry ARGS((CmMemEntries *entry, U32 key, U32 line, U8 *fileName, U8 entId)); +static S16 cmHstGrmAllocInsert ARGS((CmHstGrmHashListCp *hashListCp, uint32_t blkSz, uint32_t *reqSz, uint32_t line, uint8_t *fileName, uint8_t entId)); +static S16 cmHstGrmFreeInsert ARGS((CmHstGrmHashListCp* hashListCp, uint32_t blkSz, uint32_t line, uint8_t *fileName, uint8_t entId)); +static S16 cmHstGrmHashListInit ARGS((CmHstGrmHashListCp *hashListCp)); +static S16 cmHstGrmHashListDeInit ARGS((CmHstGrmHashListCp *hashListCp)); +static S16 cmHstGrmGetHashIdxAndKey ARGS((uint8_t *fileName, uint32_t line, uint32_t *binIdx, uint32_t *key)); +static S16 cmHstGrmFindEntry ARGS((CmHstGrmHashListCp *hashListCp, uint32_t key, uint32_t *binIdx, CmMemEntries **entry)); +static S16 cmHstGrmFillEntry ARGS((CmMemEntries *entry, uint32_t key, uint32_t line, uint8_t *fileName, uint8_t entId)); #endif /* SS_HISTOGRAM_SUPPORT */ /* cm_mem_c_001.main_22: Fixing warnings on GCC compiler */ @@ -267,32 +267,32 @@ MemLkInfo memLk; #ifdef T2K_MEM_LEAK_DBG typedef struct { -U8 minBktSzBitMask; /* minimum allocation size in Log(x)base 2, where X is minimum bucket size in region */ -U16 minBktSzMins1; /* X-1 */ +uint8_t minBktSzBitMask; /* minimum allocation size in Log(x)base 2, where X is minimum bucket size in region */ +uint16_t minBktSzMins1; /* X-1 */ }RegMinBktSzInfo; static RegMinBktSzInfo regMinBktSzInfo[SS_MAX_REGS] = {{8,0xFF},{7,0x7F},{7,0x7F},{7,0x7F}}; RegionMemLeakInfo regMemLeakInfo; -U32 getT2kMemLeakIndex(U64 address, Region region) +uint32_t getT2kMemLeakIndex(uint64_t address, Region region) { return ((address - regMemLeakInfo.regStartAddr[region]) >> regMinBktSzInfo[region].minBktSzBitMask); } -static U32 t2kMemAllocTick; -static U32 smallTick; +static uint32_t t2kMemAllocTick; +static uint32_t smallTick; -void InsertToT2kMemLeakInfo(U64 address, U32 size, U32 lineNo, char* fileName, Region region) +void InsertToT2kMemLeakInfo(uint64_t address, uint32_t size, uint32_t lineNo, char* fileName, Region region) { T2kMeamLeakInfo *leakInfo; /* if(!startMemLeak) { - RETVOID; + return; }*/ - U32 index1 = getT2kMemLeakIndex(address,region); + uint32_t index1 = getT2kMemLeakIndex(address,region); - if(((U64)(address - regMemLeakInfo.regStartAddr[region]) & regMinBktSzInfo[region].minBktSzMins1) !=0) + if(((uint64_t)(address - regMemLeakInfo.regStartAddr[region]) & regMinBktSzInfo[region].minBktSzMins1) !=0) { printf("address in InsertToT2kMemLeakInfo is %ld size = %d file is %s line is %d \n", address, size, fileName, lineNo); } @@ -326,16 +326,16 @@ void InsertToT2kMemLeakInfo(U64 address, U32 size, U32 lineNo, char* fileName, R } -void RemoveFromT2kMemLeakInfo(U64 address, char *file, U32 line,Region region) +void RemoveFromT2kMemLeakInfo(uint64_t address, char *file, uint32_t line,Region region) { T2kMeamLeakInfo *leakInfo; /* if(!startMemLeak) { - RETVALUE(ROK); + return ROK; }*/ - U32 index1 = getT2kMemLeakIndex(address, region); + uint32_t index1 = getT2kMemLeakIndex(address, region); if(index1 >= T2K_MEM_LEAK_INFO_TABLE_SIZE) { @@ -416,8 +416,8 @@ void DumpT2kMemLeakInfoToFile() /* cm_mem_c_008.104 - Addition for memory calculator tool */ #ifdef MEMCAL_DEBUG -PRIVATE Txt prntBuf[200]; /* print buffer */ -PRIVATE U8 tryHeap=0; +static Txt prntBuf[200]; /* print buffer */ +static uint8_t tryHeap=0; #endif /* cm_mem_c_001.main_12 - addition for ssi enhancements prints */ @@ -425,13 +425,13 @@ PRIVATE U8 tryHeap=0; #if (defined(SSI_DEBUG_LEVEL1) || defined(SS_HISTOGRAM_SUPPORT) || \ defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) #ifdef DEBUGP -PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ +static Txt dbgPrntBuf[200]; /* print buffer */ #endif /* DEBUGP */ #endif /*SSI_DEBUG_LEVEL1 || SS_HISTOGRAM_SUPPORT */ -U32 num_times = 0; +uint32_t num_times = 0; #ifdef SSI_MEM_CORR_PREVENTION -U32 cmDblFreeAttempts = 0; +uint32_t cmDblFreeAttempts = 0; #endif /* private variable declarations */ @@ -462,22 +462,22 @@ U32 cmDblFreeAttempts = 0; * */ #ifdef ANSI -PUBLIC S16 cmMmRegInit +S16 cmMmRegInit ( Region region, CmMmRegCb *regCb, CmMmRegCfg *cfg ) #else -PUBLIC S16 cmMmRegInit(region, regCb, cfg) +S16 cmMmRegInit(region, regCb, cfg) Region region; CmMmRegCb *regCb; CmMmRegCfg *cfg; #endif { Data *memAddr; - U16 bktIdx; - U16 lstMapIdx; + uint16_t bktIdx; + uint16_t lstMapIdx; #if (ERRCLASS & ERRCLS_INT_PAR) Size lstQnSize; @@ -485,25 +485,24 @@ CmMmRegCfg *cfg; Txt errMsg[256] = {'\0'}; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 - U16 offset; + uint16_t offset; CmMmBlkHdr ptrHdr; #endif - TRC2(cmMmRegInit); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if ((regCb == NULLP) || (cfg == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Error check on the configuration fields */ if ((!cfg->size) || (cfg->vAddr == NULLP) || (cfg->numBkts > CMM_MAX_BKT_ENT)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the quantum size is power of 2 */ if ((cfg->numBkts) && @@ -512,7 +511,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, check if BktQuantum size might not be power of 2 \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* @@ -538,7 +537,7 @@ CmMmRegCfg *cfg; \n",bktIdx,cfg->bktCfg[bktIdx].size,cfg->bktQnSize); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } if ((bktBlkSize = cfg->bktCfg[bktIdx].size) < lstQnSize) @@ -549,7 +548,7 @@ CmMmRegCfg *cfg; /* cm_mem_c_001.main_20 Addition */ sprintf(errMsg,"\n cmMmRegInit() failed, Two consecutive buckets are not separated by quantum size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_20 Addition */ if (((cfg->bktCfg[bktIdx].size) /\ @@ -565,7 +564,7 @@ CmMmRegCfg *cfg; \n should be less than CMM_MAX_MAP_ENT:%d \n",cfg->bktQnSize,CMM_MAX_MAP_ENT); #endif SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } @@ -578,7 +577,7 @@ CmMmRegCfg *cfg; sprintf(errMsg,"\n cmMmRegInit() failed, Size of the memory region is less than the required size \n"); SPrint(errMsg); - RETVALUE(RFAILED); + return RFAILED; } lstQnSize = ((bktBlkSize / cfg->bktQnSize) + 1) * cfg->bktQnSize; @@ -680,7 +679,7 @@ CmMmRegCfg *cfg; #endif } - RETVALUE(RFAILED); + return RFAILED; } cmMmBktInit( &memAddr, regCb, cfg, bktIdx, &lstMapIdx); @@ -736,7 +735,7 @@ CmMmRegCfg *cfg; } } - RETVALUE(RFAILED); + return RFAILED; } regCb->heapFlag = TRUE; @@ -746,7 +745,7 @@ CmMmRegCfg *cfg; /* Call SRegRegion to register the memory region with SSI */ if (SRegRegion(region, ®Cb->regInfo) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } /* cm_mem_c_001.main_12 - addition for initializing the hash table */ @@ -754,21 +753,21 @@ CmMmRegCfg *cfg; /* Initialize the region level hash table for debug info storage */ if (cmMmHashListInit(®Cb->hashListCp, CMM_STAT_HASH_TBL_LEN, region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 /* Initialize the hast list to maintain the SSI memory information for Broadcom */ - offset = (U16)((PTR)(&ptrHdr.ent) - (PTR) &ptrHdr); + offset = (uint16_t)((PTR)(&ptrHdr.ent) - (PTR) &ptrHdr); printf("###########offset is %d region %d\n", offset, region); if(cmHashListInit(®Cb->brdcmSsiLstCp, 1000, offset, FALSE, - CM_HASH_KEYTYPE_U32MOD, region, 0) != ROK) + CM_HASH_KEYTYPE_UINT32_MOD, region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ - RETVALUE(ROK); + return ROK; } /* end of cmMmRegInit*/ @@ -799,25 +798,24 @@ CmMmRegCfg *cfg; * */ #ifdef ANSI -PUBLIC S16 cmMmRegDeInit +S16 cmMmRegDeInit ( CmMmRegCb *regCb ) #else -PUBLIC S16 cmMmRegDeInit(regCb) +S16 cmMmRegDeInit(regCb) CmMmRegCb *regCb; #endif { - U16 bktIdx; + uint16_t bktIdx; - TRC2(cmMmRegDeInit); #if (ERRCLASS & ERRCLS_INT_PAR) /* error check on parameters */ if (regCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -827,14 +825,14 @@ CmMmRegCb *regCb; /* Deinitialize the hash table used for debug info storage at region level */ if (cmMmHashListDeinit(®Cb->hashListCp, regCb->region, 0) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* SSI_DEBUG_LEVEL1 */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 /* Deinitialize the hash table used for broadcom ssi instrumentation */ if (cmHashListDeinit(®Cb->brdcmSsiLstCp) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -878,7 +876,7 @@ CmMmRegCb *regCb; #endif } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegDeInit */ @@ -930,141 +928,141 @@ int regFreeBktSts[10][2][6]={{0}}; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType, -U32 line, -U8 *fileName, -U8 entId, +uint32_t memType, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; -U32 line; -U8 *fileName; -U8 entId; +uint32_t memType; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) +static S16 cmAlloc(regionCb, size, flags, ptr, line, fileName, entId, hstReg) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType, -U32 lineNo, -U8 *funcName +uint32_t memType, +uint32_t lineNo, +uint8_t *funcName ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName) +static S16 cmAlloc(regionCb, size, flags, ptr ,memType, lineNo, funcName) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; -U32 lineNo; -U8 *funcName; +uint32_t memType; +uint32_t lineNo; +uint8_t *funcName; #endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType +uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; +uint32_t memType; #endif #else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType +uint32_t memType ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr, memType) +static S16 cmAlloc(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; +uint32_t memType; #endif #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, - U32 flags, + uint32_t flags, Data **ptr , char* file, - U32 line + uint32_t line ) #else #ifdef ANSI -PRIVATE S16 cmAlloc +static S16 cmAlloc ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAlloc(regionCb, size, flags, ptr) +static S16 cmAlloc(regionCb, size, flags, ptr) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; #endif #endif @@ -1077,13 +1075,13 @@ Data **ptr; { /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - U16 idx; + uint16_t idx; CmMmBkt *bkt; #endif CmMmRegCb *regCb; /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - U16 cnt; + uint16_t cnt; #endif /* cm_mem_c_001.main_15 : Additions */ #if (defined(SS_MEM_LEAK_STS) || defined( BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) @@ -1101,7 +1099,7 @@ Data **ptr; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ - U16 memIndex=0; + uint16_t memIndex=0; Data *nextptr1; Data *prevptr1; Data **nextptr; @@ -1110,7 +1108,6 @@ Data **prevptr; prevptr=&prevptr1; #endif - TRC2(cmAlloc); #ifndef USE_MEMCAL UNUSED(flags); @@ -1127,7 +1124,7 @@ Data **prevptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1136,7 +1133,7 @@ Data **prevptr; #if (ERRCLASS & ERRCLS_INT_PAR) if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -1180,7 +1177,7 @@ Data **prevptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1265,7 +1262,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else #endif @@ -1278,7 +1275,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } } } @@ -1288,7 +1285,7 @@ Data **prevptr; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)*ptr, 0xAB, *size); + memset(*ptr, 0xAB, *size); #endif // printf("Pointer allocated %8p size %d\n", *ptr, *size); /* Store this pointer in hash list */ @@ -1317,7 +1314,7 @@ Data **prevptr; memIndex = (*ptr - startPtr256) / 256; } #if 1 - if (*((U32 *)(*ptr + 4)) != 0xDEADDEAD && *((U32 *)(*ptr + 80)) != 0xDEADDEAD && *((U32 *)(*ptr + 24)) != 0xDEADDEAD) + if (*((uint32_t *)(*ptr + 4)) != 0xDEADDEAD && *((uint32_t *)(*ptr + 80)) != 0xDEADDEAD && *((uint32_t *)(*ptr + 24)) != 0xDEADDEAD) { } if(bkt->size == 256) @@ -1327,7 +1324,7 @@ Data **prevptr; #endif #endif /* MS_MBUF_CORRUPTION */ #ifdef SSI_MEM_CORR_PREVENTION - *(((U32 *)(*ptr)) + 2) = 0; + *(((uint32_t *)(*ptr)) + 2) = 0; #endif #ifdef T2K_MEM_LEAK_DBG @@ -1335,7 +1332,7 @@ Data **prevptr; { /* Lock before the transaction-start */ pthread_mutex_lock(&(regMemLeakInfo.memLock[regCb->region])); - InsertToT2kMemLeakInfo( (U64)*ptr,*size,line,file,regCb->region); + InsertToT2kMemLeakInfo( (uint64_t)*ptr,*size,line,file,regCb->region); /* UnLock after the transaction */ pthread_mutex_unlock(&(regMemLeakInfo.memLock[regCb->region])); } @@ -1344,7 +1341,7 @@ Data **prevptr; bkt->next = *((CmMmEntry **)(bkt->next)); #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ *nextptr = bkt->next; - if (*((U32 *)(*nextptr + 4)) != 0xDEADDEAD && *((U32 *)(*nextptr + 80)) != 0xDEADDEAD && *((U32 *)(*nextptr + 24)) != 0xDEADDEAD) + if (*((uint32_t *)(*nextptr + 4)) != 0xDEADDEAD && *((uint32_t *)(*nextptr + 80)) != 0xDEADDEAD && *((uint32_t *)(*nextptr + 24)) != 0xDEADDEAD) { if(bkt->size == 128) *prevptr = startPtr128 + ((memIndex-1)*128); @@ -1368,12 +1365,12 @@ Data **prevptr; cmMemInfo256[memIndex][0] = cmAllocCaller[MxGetCpuID()]; } cmAllocCaller[MxGetCpuID()] = NULLP; - *((U32 *)(*ptr + 4)) = 0x00000000; - *((U32 *)(*ptr + 124)) = 0; - *((U32 *)(*ptr + 24)) = 0x00000000; - *((U32 *)(*ptr + 44)) = 0x00000000; - *((U32 *)(*ptr + 80)) = 0x00000000; - *((U32 *)(*ptr + 116)) = 0x00000000; + *((uint32_t *)(*ptr + 4)) = 0x00000000; + *((uint32_t *)(*ptr + 124)) = 0; + *((uint32_t *)(*ptr + 24)) = 0x00000000; + *((uint32_t *)(*ptr + 44)) = 0x00000000; + *((uint32_t *)(*ptr + 80)) = 0x00000000; + *((uint32_t *)(*ptr + 116)) = 0x00000000; #endif #endif /* SSI_DEBUG_LEVEL1 */ @@ -1488,7 +1485,7 @@ Data **prevptr; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -1555,34 +1552,34 @@ Data **prevptr; #ifdef SS_HISTOGRAM_SUPPORT /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ #else /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); #endif /* SSI_DEBUG_LEVEL1 */ #endif /* SS_HISTOGRAM_SUPPORT */ } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAlloc */ @@ -1613,66 +1610,66 @@ Data **prevptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size, -U32 lineNo, -U8 *funcName +uint32_t lineNo, +uint8_t *funcName ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, lineNo, funcName) +static S16 cmFree(regionCb, ptr, size, lineNo, funcName) Void *regionCb; Data *ptr; Size size; -U32 lineNo; -U8 *funcName; +uint32_t lineNo; +uint8_t *funcName; #endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmFree(regionCb, ptr, size, line, fileName, entId, hstReg) Void *regionCb; Data *ptr; Size size; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef T2K_MEM_LEAK_DBG -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size, char* file, - U32 line + uint32_t line ) #else /* T2K_MEM_LEAK_DBG */ #ifdef ANSI -PRIVATE S16 cmFree +static S16 cmFree ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFree(regionCb, ptr, size) +static S16 cmFree(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -1685,7 +1682,7 @@ Size size; { /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - U16 idx; + uint16_t idx; CmMmBkt *bkt; #endif CmMmRegCb *regCb; @@ -1701,10 +1698,9 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption*/ - U16 memIndex=0; + uint16_t memIndex=0; #endif - TRC2(cmFree); regCb = (CmMmRegCb *)regionCb; @@ -1714,7 +1710,7 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1722,7 +1718,7 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -1730,13 +1726,13 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1750,7 +1746,7 @@ Size size; #ifdef T2K_MEM_LEAK_DBG { pthread_mutex_lock(&(regMemLeakInfo.memLock[regCb->region])); - RemoveFromT2kMemLeakInfo((U64)ptr , file,line,regCb->region); + RemoveFromT2kMemLeakInfo((uint64_t)ptr , file,line,regCb->region); pthread_mutex_unlock(&(regMemLeakInfo.memLock[regCb->region])); } #endif @@ -1763,7 +1759,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1863,7 +1859,7 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else #endif @@ -1880,7 +1876,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 printf("Memory signature is invalid\n"); @@ -1892,7 +1888,7 @@ Size size; ptrHdr->requestedSize = 0; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)ptr, 0xAB, size); + memset(ptr, 0xAB, size); #endif /* check if the block to be freed is already having the state as FREE */ if (CMM_IS_FREE(ptrHdr->memFlags)) @@ -1924,7 +1920,7 @@ Size size; abort(); #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -1965,7 +1961,7 @@ Size size; #else (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else #endif @@ -1982,7 +1978,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -2011,7 +2007,7 @@ Size size; #ifndef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ #ifdef SSI_MEM_CORR_PREVENTION - if (*(((U32 *)(ptr)) + 2) == 0xdeaddead) + if (*(((uint32_t *)(ptr)) + 2) == 0xdeaddead) { /* Do not free an already freed block to avoid corruption */ cmDblFreeAttempts++; @@ -2022,7 +2018,7 @@ Size size; *((CmMmEntry **)bkt->last) = ptr; bkt->last = (CmMmEntry *)ptr; *((CmMmEntry **)ptr) = NULLP; - *(((U32 *)(ptr)) + 2) = 0xdeaddead; + *(((uint32_t *)(ptr)) + 2) = 0xdeaddead; } #else *((CmMmEntry **)ptr) = bkt->next; @@ -2089,36 +2085,36 @@ Size size; *crashPtr = 9; } } - if (*((U32 *)(ptr + 4)) != 0xDEADDEAD) + if (*((uint32_t *)(ptr + 4)) != 0xDEADDEAD) { - *(U32 *)(ptr + 4) = 0xDEADDEAD; + *(uint32_t *)(ptr + 4) = 0xDEADDEAD; } else { Data *crashPtr=NULLP; *crashPtr = 9; } - if (*((U32 *)(ptr + 24)) != 0xDEADDEAD) + if (*((uint32_t *)(ptr + 24)) != 0xDEADDEAD) { - *(U32 *)(ptr + 24) = 0xDEADDEAD; + *(uint32_t *)(ptr + 24) = 0xDEADDEAD; } else { Data *crashPtr=NULLP; *crashPtr = 9; } - if (*((U32 *)(ptr + 44)) != 0xDEADDEAD) + if (*((uint32_t *)(ptr + 44)) != 0xDEADDEAD) { - *(U32 *)(ptr + 44) = 0xDEADDEAD; + *(uint32_t *)(ptr + 44) = 0xDEADDEAD; } else { Data *crashPtr=NULLP; *crashPtr = 9; } - if (*((U32 *)(ptr + 80)) != 0xDEADDEAD) + if (*((uint32_t *)(ptr + 80)) != 0xDEADDEAD) { - *(U32 *)(ptr + 80) = 0xDEADDEAD; + *(uint32_t *)(ptr + 80) = 0xDEADDEAD; } else { @@ -2126,8 +2122,8 @@ Size size; *crashPtr = 9; /* Cause a crash to identify the caller */ } - *(U32 *)(ptr + 124) = memFreeCount++; - (*(U32 *)(ptr + 116)) = cmFreeCaller[MxGetCpuID()]; + *(uint32_t *)(ptr + 124) = memFreeCount++; + (*(uint32_t *)(ptr + 116)) = cmFreeCaller[MxGetCpuID()]; if(bkt->size == 128) { memIndex = (ptr - startPtr128) / 128; @@ -2190,18 +2186,17 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -2209,7 +2204,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -2251,54 +2246,54 @@ Size size; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType, -U32 line, -U8 *fileName, -U8 entId, +uint32_t memType, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, memType, +S16 cmAllocNL(regionCb, size, flags, ptr, memType, line, fileName, entId, hstReg) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; -U32 line; -U8 *fileName; -U8 entId; +uint32_t memType; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, line, +S16 cmAllocNL(regionCb, size, flags, ptr, line, fileName, entId, hstReg) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #endif /* SSI_DEBUG_LEVEL1 */ @@ -2306,78 +2301,78 @@ Bool hstReg; #else #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType, -U32 lineNo, -U8 *funcName +uint32_t memType, +uint32_t lineNo, +uint8_t *funcName ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName) +S16 cmAllocNL(regionCb, size, flags, ptr ,memType, lineNo, funcName) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; -U32 lineNo; -U8 *funcName; +uint32_t memType; +uint32_t lineNo; +uint8_t *funcName; #endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType +uint32_t memType ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, memType) +S16 cmAllocNL(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; +uint32_t memType; #endif #else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr, -U32 memType +uint32_t memType ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, memType) +S16 cmAllocNL(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; -U32 memType; +uint32_t memType; #endif #else #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr) +S16 cmAllocNL(regionCb, size, flags, ptr) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; #endif #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ @@ -2389,13 +2384,13 @@ Data **ptr; { /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - U16 idx; + uint16_t idx; CmMmBkt *bkt; #endif CmMmRegCb *regCb; /* cm_mem_c_001.main_26 : Fixes for Compilation Warnings */ #ifndef USE_PURE - U16 cnt; + uint16_t cnt; #endif /* cm_mem_c_001.main_15 : Additions */ #if (defined(SS_MEM_LEAK_STS) || defined( BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1)) @@ -2413,7 +2408,6 @@ Data **ptr; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmAllocNL); #ifndef USE_MEMCAL UNUSED(flags); @@ -2430,7 +2424,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2439,7 +2433,7 @@ Data **ptr; #if (ERRCLASS & ERRCLS_INT_PAR) if ((memType != CMM_STATIC_MEM_FLAG) && (memType != CMM_DYNAMIC_MEM_FLAG)) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* (ERRCLASS & ERRCLS_INT_PAR) */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -2484,7 +2478,7 @@ Data **ptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2554,12 +2548,12 @@ Data **ptr; if (cmMmBktSanityChk(bkt) == RTRAMPLINGNOK) { /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } #endif } @@ -2570,7 +2564,7 @@ Data **ptr; #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0xAB */ - cmMemset((U8 *)*ptr, 0xAB, *size); + memset(*ptr, 0xAB, *size); #endif if ((bkt->nextBlk) && *ptr) #elif SS_LIGHT_MEM_LEAK_STS @@ -2588,7 +2582,7 @@ Data **ptr; bkt->nextBlk = (CmMmBlkHdr *)(bkt->nextBlk->nextBlk); #else #ifdef SSI_MEM_CORR_PREVENTION - *(((U32 *)(*ptr)) + 2) = 0; + *(((uint32_t *)(*ptr)) + 2) = 0; #endif bkt->next = *((CmMmEntry **)(bkt->next)); #endif /* SSI_DEBUG_LEVEL1 */ @@ -2697,7 +2691,7 @@ Data **ptr; /* cm_mem_c_008.104 - Addition for memory calculator tool */ - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -2759,36 +2753,36 @@ Data **ptr; #ifdef SS_HISTOGRAM_SUPPORT /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #endif /* SSI_DEBUG_LEVEL1 */ #else /* cm_mem_c_001.main_12 - addition for passing an extra parameter */ #ifdef SSI_DEBUG_LEVEL1 - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size, memType)); #else - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); #endif /* SSI_DEBUG_LEVEL1 */ #endif /* SS_HISTOGRAM_SUPPORT */ } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocNL */ @@ -2819,58 +2813,58 @@ Data **ptr; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PUBLIC S16 cmFreeNL +S16 cmFreeNL ( Void *regionCb, Data *ptr, Size size, -U32 lineNo, -U8 *funcName +uint32_t lineNo, +uint8_t *funcName ) #else -PUBLIC S16 cmFreeNL(regionCb, ptr, size, lineNo, funcName) +S16 cmFreeNL(regionCb, ptr, size, lineNo, funcName) Void *regionCb; Data *ptr; Size size; -U32 lineNo; -U8 *funcName; +uint32_t lineNo; +uint8_t *funcName; #endif #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PUBLIC S16 cmFreeNL +S16 cmFreeNL ( Void *regionCb, Data *ptr, Size size, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PUBLIC S16 cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg) +S16 cmFreeNL(regionCb, ptr, size, line, fileName, entId, hstReg) Void *regionCb; Data *ptr; Size size; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef ANSI -PUBLIC S16 cmFreeNL +S16 cmFreeNL ( Void *regionCb, Data *ptr, Size size ) #else -PUBLIC S16 cmFreeNL(regionCb, ptr, size) +S16 cmFreeNL(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; @@ -2881,7 +2875,7 @@ Size size; { #ifndef USE_PURE - U16 idx; + uint16_t idx; CmMmBkt *bkt; #endif CmMmRegCb *regCb; @@ -2897,7 +2891,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmFreeNL); regCb = (CmMmRegCb *)regionCb; @@ -2907,7 +2900,7 @@ Size size; if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif #if (ERRCLASS & ERRCLS_INT_PAR) @@ -2915,20 +2908,20 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2948,7 +2941,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3025,12 +3018,12 @@ Size size; { bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } else { /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #endif #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -3042,7 +3035,7 @@ Size size; ptrHdr->requestedSize = 0; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 /* Initialize the elements with 0XAB */ - cmMemset((U8 *)ptr, 0xAB, size); + memset(ptr, 0xAB, size); #endif /* check if the block to be freed is already having the state as FREE */ if (CMM_IS_FREE(ptrHdr->memFlags)) @@ -3070,7 +3063,7 @@ Size size; #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -3104,12 +3097,12 @@ Size size; { /* do not add to the free list */ bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } else { /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } #endif } @@ -3138,7 +3131,7 @@ Size size; #else #ifdef SSI_MEM_CORR_PREVENTION - if (*(((U32 *)(ptr)) + 2) == 0xdeaddead) + if (*(((uint32_t *)(ptr)) + 2) == 0xdeaddead) { /* Do not free an already freed block to avoid corruption */ cmDblFreeAttempts++; @@ -3149,7 +3142,7 @@ Size size; *((CmMmEntry **)bkt->last) = ptr; bkt->last = (CmMmEntry *)ptr; *((CmMmEntry **)ptr) = NULLP; - *(((U32 *)(ptr)) + 2) = 0xdeaddead; + *(((uint32_t *)(ptr)) + 2) = 0xdeaddead; } #else *((CmMmEntry **)ptr) = bkt->next; @@ -3186,18 +3179,17 @@ Size size; cmRlsAllocBlk((PTR)ptr); #endif /* SS_MEM_LEAK_STS */ - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); + return (cmHeapFree (&(regCb->heapCb), ptr, size, line, fileName, entId, hstReg)); #else - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #endif /* SS_HISTOGRAM_SUPPORT */ #else /* use pure is on */ - TRC2(cmFreeNL); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3205,7 +3197,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmFreeNL */ @@ -3228,27 +3220,26 @@ Size size; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ #ifdef SS_FAP #ifdef ANSI -PRIVATE S16 cmAllocWL +static S16 cmAllocWL ( Void *regionCb, Size *size, -U32 flags, +uint32_t flags, Data **ptr ) #else -PRIVATE S16 cmAllocWL(regionCb, size, flags, ptr) +static S16 cmAllocWL(regionCb, size, flags, ptr) Void *regionCb; Size *size; -U32 flags; +uint32_t flags; Data **ptr; #endif { - U16 idx; + uint16_t idx; CmMmBkt *bkt; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmAllocWL); /*cm_mem_c_001.main_23 Removed support of USE_MEMCAL and MEMCAL_DEBUG support for SS_FAP*/ @@ -3259,7 +3250,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3300,7 +3291,7 @@ Data **ptr; /* Update the size parameter */ *size = bkt->size; - RETVALUE(ROK); + return ROK; } } } @@ -3314,23 +3305,23 @@ Data **ptr; * heap pool. */ /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - RETVALUE(cmHeapAlloc(&(regCb->heapCb), ptr, size)); + return (cmHeapAlloc(&(regCb->heapCb), ptr, size)); } /* No memory available */ - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE *ptr = (Data*) MxHeapAlloc(SsiHeap, *size); - cmMemset((U8*)ptr, 0, *size); + memset(ptr, 0, *size); #else *ptr = (Data*) malloc(*size); #endif if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; avail_size -= *size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocWL */ @@ -3352,25 +3343,24 @@ Data **ptr; */ #ifdef ANSI -PRIVATE S16 cmFreeWL +static S16 cmFreeWL ( Void *regionCb, Data *ptr, Size size ) #else -PRIVATE S16 cmFreeWL(regionCb, ptr, size) +static S16 cmFreeWL(regionCb, ptr, size) Void *regionCb; Data *ptr; Size size; #endif { - U16 idx; + uint16_t idx; CmMmBkt *bkt; CmMmRegCb *regCb; /*cm_mem_c_001.main_23 Removed support of SSI_DEBUG_LEVEL1 and SS_HISTOGRAM_SUPPORT for SS_FAP*/ - TRC2(cmFreeWL); regCb = (CmMmRegCb *)regionCb; @@ -3380,14 +3370,14 @@ Size size; /* error check on parameters */ if ((regCb == NULLP) || (!size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } /* Check if the memory block is from the memory region */ if (ptr >= ((CmMmRegCb *)regCb)->regInfo.start + ((CmMmRegCb *)regCb)->regInfo.size) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3407,7 +3397,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3436,13 +3426,12 @@ Size size; */ bkt->numAlloc--; - RETVALUE(ROK); + return ROK; } /* The memory block was allocated from the heap pool */ - RETVALUE(cmHeapFree (&(regCb->heapCb), ptr, size)); + return (cmHeapFree (&(regCb->heapCb), ptr, size)); #else /* use pure is on */ - TRC2(cmFree); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE (Void)MxHeapFree(SsiHeap, ptr); @@ -3450,7 +3439,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3482,14 +3471,14 @@ Size size; */ #ifdef ANSI -PRIVATE S16 cmCtl +static S16 cmCtl ( Void *regionCb, Event event, SMemCtl *memCtl ) #else -PRIVATE S16 cmCtl(regionCb, event, memCtl) +static S16 cmCtl(regionCb, event, memCtl) Void *regionCb; Event event; SMemCtl *memCtl; @@ -3497,7 +3486,6 @@ SMemCtl *memCtl; { CmMmRegCb *regCb; - TRC2(cmCtl); regCb = (CmMmRegCb *)regionCb; @@ -3506,7 +3494,7 @@ SMemCtl *memCtl; /* error check on parameters */ if ((regCb == NULLP) || (memCtl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3521,7 +3509,7 @@ SMemCtl *memCtl; if ((memCtl->u.vtop.vaddr == NULLP) || (memCtl->u.vtop.paddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3531,7 +3519,7 @@ SMemCtl *memCtl; offset = memCtl->u.vtop.vaddr - regCb->regInfo.start; *(memCtl->u.vtop.paddr) = regCb->pAddr + offset; - RETVALUE(ROK); + return ROK; } break; } @@ -3543,16 +3531,16 @@ SMemCtl *memCtl; if (!(memCtl->u.chkres.size) || (memCtl->u.chkres.status == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef USE_PURE /* Check if the Bucket pool is configured */ if (regCb->bktSize) { - U16 idx; + uint16_t idx; CmMmBkt *bkt; - U32 avlSize, totSize; + uint32_t avlSize, totSize; /* * The bucket pool is configured. The status value returned * does reflect on the memory availabilty in the bucket pool. @@ -3578,11 +3566,11 @@ SMemCtl *memCtl; (regCb->heapSize/10)); } - RETVALUE(ROK); + return ROK; #else /* use pure is on */ *(memCtl->u.chkres.status) = ((avail_size) / (regCb->regInfo.size/10)); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } @@ -3590,12 +3578,12 @@ SMemCtl *memCtl; default: { /* No other event is supported currently */ - RETVALUE(RFAILED); + return RFAILED; } } /* shouldn't reach here */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmCtl */ @@ -3615,26 +3603,26 @@ SMemCtl *memCtl; * */ #ifdef ANSI -PRIVATE Void cmMmBktInit +static Void cmMmBktInit ( Data **memAddr, CmMmRegCb *regCb, CmMmRegCfg *cfg, -U16 bktIdx, -U16 *lstMapIdx +uint16_t bktIdx, +uint16_t *lstMapIdx ) #else -PRIVATE Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) +static Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) Data **memAddr; CmMmRegCb *regCb; CmMmRegCfg *cfg; -U16 bktIdx; -U16 *lstMapIdx; +uint16_t bktIdx; +uint16_t *lstMapIdx; #endif { - U32 cnt; - U16 idx; - U32 numBlks; + uint32_t cnt; + uint16_t idx; + uint32_t numBlks; Size size; /* cm_mem_c_001.main_12 - addition for temporary variables */ #if (defined(SSI_DEBUG_LEVEL1) || defined(BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1) || defined (SS_LIGHT_MEM_LEAK_STS)) @@ -3642,7 +3630,7 @@ U16 *lstMapIdx; #ifdef SS_LIGHT_MEM_LEAK_STS CmMmBlkHdr *lastBlk; #endif /*SS_LIGHT_MEM_LEAK_STS */ - U32 sigCnt; + uint32_t sigCnt; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 Data *tmpMemAddr; CmMmBlkTail *blkTail; @@ -3654,7 +3642,6 @@ U16 *lstMapIdx; #endif #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmBktInit); size = cfg->bktCfg[bktIdx].size; @@ -3709,7 +3696,7 @@ U16 *lstMapIdx; *nextBlk = NULLP; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 - tmpMemAddr = (Data *)((*memAddr) - ((sizeof(CmMmBlkHdr)) + sizeof(U32) + size)); + tmpMemAddr = (Data *)((*memAddr) - ((sizeof(CmMmBlkHdr)) + sizeof(uint32_t) + size)); regCb->bktTbl[bktIdx].lastBlk = (CmMmBlkHdr *)tmpMemAddr; #endif @@ -3769,15 +3756,15 @@ U16 *lstMapIdx; { *next = *memAddr; #ifdef MS_MBUF_CORRUPTION /* Should be enabled when debugging mbuf corruption */ - (*(U32 *)(*next + 4)) = 0xdeaddead; - (*(U32 *)(*next + 124)) = 0; - (*(U32 *)(*next + 116)) = 0xdeaddead; - (*(U32 *)(*next + 24)) = 0xdeaddead; - (*(U32 *)(*next + 44)) = 0xdeaddead; - (*(U32 *)(*next + 80)) = 0xdeaddead; + (*(uint32_t *)(*next + 4)) = 0xdeaddead; + (*(uint32_t *)(*next + 124)) = 0; + (*(uint32_t *)(*next + 116)) = 0xdeaddead; + (*(uint32_t *)(*next + 24)) = 0xdeaddead; + (*(uint32_t *)(*next + 44)) = 0xdeaddead; + (*(uint32_t *)(*next + 80)) = 0xdeaddead; #endif #ifdef SSI_MEM_CORR_PREVENTION - *(((U32 *)(*next)) + 2) = 0xdeaddead; + *(((uint32_t *)(*next)) + 2) = 0xdeaddead; #endif next = (CmMmEntry **)(*memAddr); *memAddr = (*memAddr) + size; @@ -3827,7 +3814,7 @@ U16 *lstMapIdx; regCb->bktSize += ((size + sizeof(CmMmBlkHdr)) * numBlks); /* Addition for considering the header size and tail */ #elif BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 - regCb->bktSize += ((size + sizeof(CmMmBlkHdr) + sizeof(U32)) * numBlks); + regCb->bktSize += ((size + sizeof(CmMmBlkHdr) + sizeof(uint32_t)) * numBlks); #else regCb->bktSize += (size * numBlks); #endif /* SSI_DEBUG_LEVEL1 */ @@ -3851,7 +3838,7 @@ U16 *lstMapIdx; cmHstGrmHashListInit(&(regCb->bktTbl[bktIdx].hstGrmHashListCp)); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVOID; + return; } /* end of cmMmBktInit */ @@ -3871,14 +3858,14 @@ U16 *lstMapIdx; * */ #ifdef ANSI -PRIVATE Void cmMmHeapInit +static Void cmMmHeapInit ( Data *memAddr, CmMmHeapCb *heapCb, Size size ) #else -PRIVATE Void cmMmHeapInit (memAddr, heapCb, size) +static Void cmMmHeapInit (memAddr, heapCb, size) Data *memAddr; CmMmHeapCb *heapCb; Size size; @@ -3886,9 +3873,8 @@ Size size; { /* cm_mem_c_001.main_12 - addition for ssi enhancements */ #ifdef SSI_DEBUG_LEVEL1 - U16 idx; + uint16_t idx; #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmHeapInit); /* Initialize the heap control block */ heapCb->vStart = memAddr; @@ -3931,7 +3917,7 @@ Size size; /* Initialise the memory histogram hash list */ cmHstGrmHashListInit(&(heapCb->heapHstGrmHashListCp)); #endif /* SS_HISTOGRAM_SUPPORT */ - RETVOID; + return; } /* end of cmMmHeapInit */ @@ -3958,83 +3944,83 @@ Size size; /* cm_mem_c_001.main_12 - addition for taking another parameter memType(static/dynamic) */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_4GMX_LCORE -EXTERN U8 ysCellConfigDone; +uint8_t ysCellConfigDone; #endif #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size, -U32 memType, -U32 line, -U8 *fileName, -U8 entId, +uint32_t memType, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, memType, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; -U32 memType; -U32 line; -U8 *fileName; -U8 entId; +uint32_t memType; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapAlloc (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data **ptr; Size *size; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #endif /* SSI_DEBUG_LEVEL1 */ #else #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size, -U32 memType +uint32_t memType ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size, memType) +static S16 cmHeapAlloc (heapCb, ptr, size, memType) CmMmHeapCb *heapCb; Data **ptr; Size *size; -U32 memType; +uint32_t memType; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapAlloc +static S16 cmHeapAlloc ( CmMmHeapCb *heapCb, Data **ptr, Size *size ) #else -PRIVATE S16 cmHeapAlloc (heapCb, ptr, size) +static S16 cmHeapAlloc (heapCb, ptr, size) CmMmHeapCb *heapCb; Data **ptr; Size *size; @@ -4055,14 +4041,13 @@ Size *size; CmHEntry *alocHeapBlk; Size requestedSize; Size hdr; - U16 idx; + uint16_t idx; #endif /* SSI_DEBUG_LEVEL1 */ /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapAlloc); /* cm_mem_c_001.main_15 : Additions */ /* Acquire the heap lock */ /* cm_mem_c_001.main_13 : Replaced SLock with WTLock for NT */ @@ -4103,7 +4088,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -4199,7 +4184,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4211,7 +4196,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4282,7 +4267,7 @@ Size *size; #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4300,7 +4285,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } /* end of cmHeapAlloc */ @@ -4331,36 +4316,36 @@ Size *size; /* cm_mem_c_001.main_15 : Additions */ #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size, -U32 line, -U8 *fileName, -U8 entId, +uint32_t line, +uint8_t *fileName, +uint8_t entId, Bool hstReg ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) +static S16 cmHeapFree (heapCb, ptr, size, line, fileName, entId, hstReg) CmMmHeapCb *heapCb; Data *ptr; Size size; -U32 line; -U8 *fileName; -U8 entId; +uint32_t line; +uint8_t *fileName; +uint8_t entId; Bool hstReg; #endif #else #ifdef ANSI -PRIVATE S16 cmHeapFree +static S16 cmHeapFree ( CmMmHeapCb *heapCb, Data *ptr, Size size ) #else -PRIVATE S16 cmHeapFree (heapCb, ptr, size) +static S16 cmHeapFree (heapCb, ptr, size) CmMmHeapCb *heapCb; Data *ptr; Size size; @@ -4380,7 +4365,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmHeapFree); /* Roundup the requested size */ size = CMM_DATALIGN(size, (heapCb->minSize)); @@ -4447,7 +4431,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4461,7 +4445,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROK); + return ROK; } } @@ -4486,7 +4470,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RDBLFREE); + return (RDBLFREE); } #endif /* SSI_DEBUG_LEVEL1 */ @@ -4544,7 +4528,7 @@ Size size; #endif /* This block is already freed in the heap */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } /* update the flags as it is a new node */ if (CMM_IS_STATIC(p->memFlags)) @@ -4605,7 +4589,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } else if (p < curHBlk) @@ -4676,7 +4660,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4725,7 +4709,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* Release the lock */ @@ -4736,55 +4720,55 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHeapFree */ #endif/*USE_PURE*/ #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PUBLIC U32 cmGetFreeIndx +uint32_t cmGetFreeIndx ( Void ) #else -PUBLIC U32 cmGetFreeIndx(Void) +uint32_t cmGetFreeIndx(Void) #endif { if(gmemLkCb.head == gmemLkCb.tail) { allocQueueEmptyCnt++; - RETVALUE(CM_MAX_ALLOC_ENTERIES); + return (CM_MAX_ALLOC_ENTERIES); } else { - U32 allocQIndx = gmemLkCb.queue[gmemLkCb.head]; + uint32_t allocQIndx = gmemLkCb.queue[gmemLkCb.head]; gmemLkCb.head = (gmemLkCb.head +1) % CM_MAX_ALLOC_ENTERIES; - RETVALUE(allocQIndx); + return (allocQIndx); } } #ifdef ANSI -PUBLIC U32 cmPutFreeIndx +uint32_t cmPutFreeIndx ( -U32 allocQIndx +uint32_t allocQIndx ) #else -PUBLIC U32 cmPutFreeIndx(allocQIndx) -U32 allocQIndx; +uint32_t cmPutFreeIndx(allocQIndx) +uint32_t allocQIndx; #endif { - U32 tmpTail = (gmemLkCb.tail+1)% CM_MAX_ALLOC_ENTERIES; + uint32_t tmpTail = (gmemLkCb.tail+1)% CM_MAX_ALLOC_ENTERIES; if(tmpTail == gmemLkCb.head) { allocQueueFullCnt++; - RETVALUE(RFAILED); + return RFAILED; } else { gmemLkCb.queue[gmemLkCb.tail] = allocQIndx; gmemLkCb.tail = tmpTail; - RETVALUE(ROK); + return ROK; } } /* @@ -4794,7 +4778,7 @@ U32 allocQIndx; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -4803,17 +4787,16 @@ U32 allocQIndx; * */ #ifdef ANSI -PUBLIC Void cmInitMemLeak +Void cmInitMemLeak ( Void ) #else -PUBLIC Void cmInitMemLeak (Void) +Void cmInitMemLeak (Void) #endif { - U32 indx; + uint32_t indx; - TRC3(cmInitMemLeak); gmemLkCb.isStarted = FALSE; gmemLkCb.head = 0; @@ -4825,7 +4808,7 @@ PUBLIC Void cmInitMemLeak (Void) cmPutFreeIndx(indx); } - RETVOID; + return; } /* cmInitMemLeak */ /* * @@ -4834,7 +4817,7 @@ PUBLIC Void cmInitMemLeak (Void) * Desc: De-initializes the memory leak detection * * - * Ret: RETVOID + * Ret: void * * Notes: This function de-initializes the memory leak detection module. * @@ -4843,17 +4826,16 @@ PUBLIC Void cmInitMemLeak (Void) * **/ #ifdef ANSI -PUBLIC Void cmDeinitMemLeak +Void cmDeinitMemLeak ( Void ) #else -PUBLIC Void cmDeinitMemLeak (Void) +Void cmDeinitMemLeak (Void) #endif { - U32 indx; + uint32_t indx; - TRC3(cmDeinitMemLeak); for(indx = 0; indx < CM_MAX_ALLOC_ENTERIES; indx++) { @@ -4863,7 +4845,7 @@ PUBLIC Void cmDeinitMemLeak (Void) gmemLkCb.isStarted = FALSE; gmemLkCb.head = 0; gmemLkCb.tail = 0; - RETVOID; + return; } /* * @@ -4872,7 +4854,7 @@ PUBLIC Void cmDeinitMemLeak (Void) * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -4881,17 +4863,17 @@ PUBLIC Void cmDeinitMemLeak (Void) * */ #ifdef ANSI -PUBLIC U32 cmStorAllocBlk +uint32_t cmStorAllocBlk ( Void *addr ) #else -PUBLIC U32 cmStorAllocBlk (addr) +uint32_t cmStorAllocBlk (addr) Void *addr; #endif /* ANSI */ { - U32 allocQIndx; + uint32_t allocQIndx; (Void) SLock(&gmemLkCb.memLock); allocQIndx = cmGetFreeIndx(); @@ -4903,7 +4885,7 @@ Void *addr; } (Void) SUnlock(&(gmemLkCb.memLock)); - RETVALUE(allocQIndx); + return (allocQIndx); } /* cmStorAllocBlk */ @@ -4914,7 +4896,7 @@ Void *addr; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -4923,16 +4905,15 @@ Void *addr; * */ #ifdef ANSI -PUBLIC Void cmRlsAllocBlk +Void cmRlsAllocBlk ( -U32 allocQIndx +uint32_t allocQIndx ) #else -PUBLIC Void cmRlsAllocBlk(allocQIndx) -U32 allocQIndx; +Void cmRlsAllocBlk(allocQIndx) +uint32_t allocQIndx; #endif { - TRC3(cmRlsAllocBlk); if(allocQIndx < CM_MAX_ALLOC_ENTERIES) { @@ -4945,7 +4926,7 @@ U32 allocQIndx; (Void) SUnlock(&(gmemLkCb.memLock)); } } - RETVOID; + return; } /* cmRlsAllocBlk */ /* @@ -4960,12 +4941,12 @@ U32 allocQIndx; * */ #ifdef ANSI -PUBLIC Void cmStartStopLeakLog +Void cmStartStopLeakLog ( Void ) #else -PUBLIC Void cmStartStopLeakLog(Void) +Void cmStartStopLeakLog(Void) #endif { if (FALSE == gmemLkCb.isStarted) @@ -4979,7 +4960,7 @@ PUBLIC Void cmStartStopLeakLog(Void) printf("!!leak capturing stopped\n"); cmPrintLeakLog(); } - RETVOID; + return; } /* @@ -4996,20 +4977,19 @@ PUBLIC Void cmStartStopLeakLog(Void) * */ #ifdef ANSI -PUBLIC Void cmPrintLeakLog +Void cmPrintLeakLog ( Void ) #else -PUBLIC Void cmPrintLeakLog(Void) +Void cmPrintLeakLog(Void) #endif { - U32 indx; + uint32_t indx; CmMmBlkHdr *aBkt; - static U32 leakCount =0; + static uint32_t leakCount =0; - TRC3(cmPrintLeakLog); printf("---- START OF LEAK LOG ----"); SLock(&gmemLkCb.memLock); @@ -5034,7 +5014,7 @@ PUBLIC Void cmPrintLeakLog(Void) SUnlock(&gmemLkCb.memLock); printf("---- Lock Released ----"); leakCount =0; - RETVOID; + return; } #endif @@ -5047,7 +5027,7 @@ PUBLIC Void cmPrintLeakLog(Void) * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5057,55 +5037,54 @@ PUBLIC Void cmPrintLeakLog(Void) */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef ANSI -PUBLIC Void cmRlsAllocBlk +Void cmRlsAllocBlk ( CmMmBlkHdr *ptrHdr, CmMmRegCb *regCb ) #else -PUBLIC Void cmRlsAllocBlk(ptrHdr, regCb) +Void cmRlsAllocBlk(ptrHdr, regCb) CmMmBlkHdr *ptrHdr; CmMmRegCb *regCb; #endif #else #ifdef ANSI -PUBLIC Void cmRlsAllocBlk +Void cmRlsAllocBlk ( #ifdef BIT_64 -U64 addr +uint64_t addr #else -U32 addr +uint32_t addr #endif ) #else -PUBLIC Void cmRlsAllocBlk(addr) +Void cmRlsAllocBlk(addr) #ifdef BIT_64 -U64 addr; +uint64_t addr; #else -U32 addr; +uint32_t addr; #endif #endif #endif { Ptr trace[CM_MAX_STACK_TRACE]; S8 **funcNm; - U8 idx; - U8 i; + uint8_t idx; + uint8_t i; S16 retVal; S32 traceSize; #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 MemAllocInfo *memAllocInfo; #endif - TRC3(cmRlsAllocBlk); #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef BIT_64 - retVal = cmHashListFind(®Cb->brdcmSsiLstCp,(U8 *)&ptrHdr, - (U16)sizeof(U64), 0, (PTR *)&ptrHdr); + retVal = cmHashListFind(®Cb->brdcmSsiLstCp,(uint8_t *)&ptrHdr, + (uint16_t)sizeof(uint64_t), 0, (PTR *)&ptrHdr); #else - retVal = cmHashListFind(®Cb->brdcmSsiLstCp,(U8 *)&ptrHdr, - (U16)sizeof(U32), 0, (PTR *)&ptrHdr); + retVal = cmHashListFind(®Cb->brdcmSsiLstCp,(uint8_t *)&ptrHdr, + (uint16_t)sizeof(uint32_t), 0, (PTR *)&ptrHdr); #endif if(retVal == ROK) { @@ -5114,18 +5093,18 @@ U32 addr; #else if( memLkCb.memLkMdlInit == FALSE) { - RETVOID; + return; } for(idx = 0; idx < CM_MEM_USR_MDL; idx++) { SLock(&memLkCb.memUsrMdl[idx][addr & 0x3].memLck); #ifdef BIT_64 retVal = cmHashListFind(&memLkCb.memUsrMdl[idx][addr & 0x3].memHashCp, - (U8 *)&addr, sizeof(U64), 0, + (uint8_t *)&addr, sizeof(uint64_t), 0, (PTR *)&memAllocInfo); #else retVal = cmHashListFind(&memLkCb.memUsrMdl[idx][addr & 0x3].memHashCp, - (U8 *)&addr, sizeof(U32), 0, + (uint8_t *)&addr, sizeof(uint32_t), 0, (PTR *)&memAllocInfo); #endif if(retVal == ROK) @@ -5217,7 +5196,7 @@ U32 addr; #endif /* SS_MEM_LEAK_SOL */ #endif/* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ /*cm_mem_c_001.main_25 : */ - RETVOID; + return; } /* cmRlsAllocBlk */ @@ -5228,7 +5207,7 @@ U32 addr; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5238,45 +5217,45 @@ U32 addr; */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef ANSI -PUBLIC Void cmStorAllocBlk +Void cmStorAllocBlk ( CmMmBlkHdr *ptrHdr, Size reqSz, Size allocSz, -U16 bktIdx, +uint16_t bktIdx, CmMmRegCb *regCb ) #else -PUBLIC Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb) +Void cmStorAllocBlk (ptrHdr, reqSz, allocSz, bktIdx, regCb) CmMmBlkHdr *ptrHdr; Size reqSz; Size allocSz; -U16 bktIdx; +uint16_t bktIdx; CmMmRegCb *regCb; #endif #else #ifdef ANSI -PUBLIC Void cmStorAllocBlk +Void cmStorAllocBlk ( #ifdef BIT_64 -U64 addr, +uint64_t addr, #else -U32 addr, +uint32_t addr, #endif Size reqSz, Size allocSz, -U16 bktIdx +uint16_t bktIdx ) #else -PUBLIC Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) +Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) #ifdef BIT_64 -U64 addr; +uint64_t addr; #else -U32 addr; +uint32_t addr; #endif Size reqSz; Size allocSz; -U16 bktIdx; +uint16_t bktIdx; #endif /* ANSI */ #endif /* BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 */ { @@ -5284,19 +5263,18 @@ U16 bktIdx; void *trace[CM_MAX_STACK_TRACE]; #endif /* SS_MEM_LEAK_SOL */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 - U8 btrIdx; + uint8_t btrIdx; #else MemAllocInfo *allocInfo; - U8 moduleId; + uint8_t moduleId; S8 **funcNm; S32 traceSize; #endif - TRC3(cmStorAllocBlk); #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 if( memLkCb.memLkMdlInit == FALSE) { - RETVOID; + return; } #endif #ifdef SS_MEM_LEAK_SOL @@ -5305,12 +5283,12 @@ U16 bktIdx; * implementation. */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE - funcNm = (S8 **)MxHeapAlloc(SsiHeap, (sizeof(U32) * CM_MAX_STACK_TRACE)); - cmMemset((U8*)funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); + funcNm = (S8 **)MxHeapAlloc(SsiHeap, (sizeof(uint32_t) * CM_MAX_STACK_TRACE)); + memset(funcNm, 0, (sizeof(uint32_t) * CM_MAX_STACK_TRACE)); #else - funcNm = (S8 **)calloc(1, (sizeof(U32) * CM_MAX_STACK_TRACE)); + funcNm = (S8 **)calloc(1, (sizeof(uint32_t) * CM_MAX_STACK_TRACE)); #endif - /* SGetSBuf(DFLT_REGION, DFLT_POOL, &funcNm, sizeof(U32) * CM_MAX_STACK_TRACE); */ + /* SGetSBuf(DFLT_REGION, DFLT_POOL, &funcNm, sizeof(uint32_t) * CM_MAX_STACK_TRACE); */ traceSize = backtrace((Void **)funcNm, CM_MAX_STACK_TRACE); #else /* SS_MEM_LEAK_SOL */ #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 @@ -5328,7 +5306,7 @@ U16 bktIdx; #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef SS_4GMX_LCORE allocInfo = (MemAllocInfo *)MxHeapAlloc(SsiHeap, sizeof(MemAllocInfo)); - cmMemset((U8*)allocInfo, 0, sizeof(MemAllocInfo)); + memset(allocInfo, 0, sizeof(MemAllocInfo)); #else allocInfo = (MemAllocInfo *)calloc(1, sizeof(MemAllocInfo)); #endif @@ -5338,19 +5316,13 @@ U16 bktIdx; /* check if hashListCp is initialised yet */ if ( regCb->brdcmSsiLstCp.nmbBins == 0) { - RETVALUE(ROK); + return ROK; } ptrHdr->reqSz = reqSz; ptrHdr->allocSz = allocSz; ptrHdr->bktIdx = bktIdx; -#if 0 - for(btrIdx = 0; btrIdx < BRDCM_MEM_LEAK_BTRACE; btrIdx++) - { - // ptrHdr->backTrace[btrIdx] = __builtin_return_address(btrIdx); - } -#endif cmHashListInsert(®Cb->brdcmSsiLstCp, (PTR)ptrHdr, - (U8 *)&(ptrHdr), sizeof(PTR)); + (uint8_t *)&(ptrHdr), sizeof(PTR)); #else allocInfo->memAddr = addr; allocInfo->reqSz = reqSz; @@ -5360,18 +5332,18 @@ U16 bktIdx; allocInfo->moduleId = moduleId; allocInfo->bTrcSz = traceSize; cmHashListInsert(&memLkCb.memUsrMdl[moduleId][addr & 0x3].memHashCp, - (PTR)allocInfo, (U8 *)&(allocInfo->memAddr), + (PTR)allocInfo, (uint8_t *)&(allocInfo->memAddr), sizeof(allocInfo->memAddr)); memLkCb.memUsrMdl[moduleId][addr & 0x3].used = TRUE; (Void) SUnlock(&(memLkCb.memUsrMdl[moduleId][addr & 0x3].memLck)); #endif - RETVOID; + return; } /* cmStorAllocBlk */ /* * - RETVOID; + return; } /* cmStorAllocBlk */ /* @@ -5381,7 +5353,7 @@ U16 bktIdx; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5390,17 +5362,17 @@ U16 bktIdx; * */ #ifdef ANSI -PUBLIC Void SLogLkInfo +Void SLogLkInfo ( Void ) #else -PUBLIC Void SLogLkInfo (Void) +Void SLogLkInfo (Void) #endif { #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 - U8 idx; - U8 regionIdx; + uint8_t idx; + uint8_t regionIdx; Txt prntBuf[255]; S8 **funcNm; CmMmBlkHdr *newBlkHdr; @@ -5408,7 +5380,6 @@ PUBLIC Void SLogLkInfo (Void) CmMmRegCb *tmpRegCb; FILE *fp; - TRC3(SLogLkInfo); fp = fopen("meLeakLog.txt", "w"); if(fp == NULL) { @@ -5461,15 +5432,14 @@ PUBLIC Void SLogLkInfo (Void) #else MemAllocInfo *oldMemInfo; MemAllocInfo *newMemInfo; - U8 memMdl; - U8 hashIdx; - U8 idx; + uint8_t memMdl; + uint8_t hashIdx; + uint8_t idx; Txt prntBuf[255]; S8 **funcNm; - TRC3(SLogLkInfo); if( memLkCb.memLkMdlInit == FALSE) { - RETVOID; + return; } sprintf(prntBuf, "\n------- START OF LEAK LOG -------\n"); fwrite(prntBuf, strlen(prntBuf), 1, memLkCb.fileLkLog); @@ -5526,7 +5496,7 @@ PUBLIC Void SLogLkInfo (Void) sprintf(prntBuf, "\n------- END OF LEAK LOG -------\n"); fwrite(prntBuf, strlen(prntBuf), 1, memLkCb.fileLkLog); #endif - RETVOID; + return; } #endif @@ -5540,7 +5510,7 @@ PUBLIC Void SLogLkInfo (Void) * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5549,18 +5519,17 @@ PUBLIC Void SLogLkInfo (Void) * */ #ifdef ANSI -PUBLIC Void cmInitMemLeakMdl +Void cmInitMemLeakMdl ( Void ) #else -PUBLIC Void cmInitMemLeakMdl (Void) +Void cmInitMemLeakMdl (Void) #endif { - U8 memMdl; - U8 hashIdx; + uint8_t memMdl; + uint8_t hashIdx; - TRC3(cmInitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5569,7 +5538,7 @@ PUBLIC Void cmInitMemLeakMdl (Void) { SInitLock(&memLkCb.memUsrMdl[memMdl][hashIdx].memLck, 1); cmHashListInit(&memLkCb.memUsrMdl[memMdl][hashIdx].memHashCp, - 500, 0, FALSE, CM_HASH_KEYTYPE_U32MOD, 0, 0); + 500, 0, FALSE, CM_HASH_KEYTYPE_UINT32_MOD, 0, 0); memLkCb.memUsrMdl[memMdl][hashIdx].used = FALSE; } } @@ -5579,7 +5548,7 @@ PUBLIC Void cmInitMemLeakMdl (Void) } memLkCb.memLkMdlInit = TRUE; - RETVOID; + return; } /* cmInitMemLeakMdl */ /* cm_mem_c_002.main_21 Added for shutdown procedure */ /* @@ -5589,7 +5558,7 @@ PUBLIC Void cmInitMemLeakMdl (Void) * Desc: De-initializes the memory leak detection module * * - * Ret: RETVOID + * Ret: void * * Notes: This function de-initializes the memory leak detection module. * @@ -5598,18 +5567,17 @@ PUBLIC Void cmInitMemLeakMdl (Void) * **/ #ifdef ANSI -PUBLIC Void cmDeinitMemLeakMdl +Void cmDeinitMemLeakMdl ( Void ) #else -PUBLIC Void cmDeinitMemLeakMdl (Void) +Void cmDeinitMemLeakMdl (Void) #endif { - U8 memMdl; - U8 hashIdx; + uint8_t memMdl; + uint8_t hashIdx; - TRC3(cmDeinitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5621,7 +5589,7 @@ PUBLIC Void cmDeinitMemLeakMdl (Void) memLkCb.memUsrMdl[memMdl][hashIdx].used = FALSE; } } - RETVOID; + return; } /* * @@ -5630,7 +5598,7 @@ PUBLIC Void cmDeinitMemLeakMdl (Void) * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5639,19 +5607,18 @@ PUBLIC Void cmDeinitMemLeakMdl (Void) * */ #ifdef ANSI -PUBLIC Void cmMemOpenMemLkFile +Void cmMemOpenMemLkFile ( S8 *arg ) #else -PUBLIC Void cmMemOpenMemLkFile (arg) +Void cmMemOpenMemLkFile (arg) S8 *msOptArg; #endif { - TRC3(cmMemOpenMemLkFile); memLkCb.fileLkLog = NULLP; memLkCb.fileLkLog = fopen(arg, "w"); - RETVOID; + return; } /* * @@ -5660,7 +5627,7 @@ S8 *msOptArg; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5669,26 +5636,25 @@ S8 *msOptArg; * */ #ifdef ANSI -PUBLIC Void SFlushLkInfo +Void SFlushLkInfo ( Void ) #else -PUBLIC Void SFlushLkInfo (Void) +Void SFlushLkInfo (Void) #endif { MemAllocInfo *newMemInfo; - U8 memMdl; - U8 hashIdx; + uint8_t memMdl; + uint8_t hashIdx; S8 **funcNm; #ifdef SS_MEM_LEAK_SOL - U8 i; + uint8_t i; #endif /* SS_MEM_LEAK_SOL */ - TRC3(SFlushLkInfo); if( memLkCb.memLkMdlInit == FALSE) { - RETVOID; + return; } for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5714,7 +5680,7 @@ PUBLIC Void SFlushLkInfo (Void) #else free(funcNm[i]); #endif - /* SPutSBuf(DFLT_REGION, DFLT_POOL, funcNm[i], sizeof(U32) * CM_MAX_STACK_TRACE); */ + /* SPutSBuf(DFLT_REGION, DFLT_POOL, funcNm[i], sizeof(uint32_t) * CM_MAX_STACK_TRACE); */ } #endif /* SS_MEM_LEAK_SOl */ /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ @@ -5729,7 +5695,7 @@ PUBLIC Void SFlushLkInfo (Void) SUnlock(&memLkCb.memUsrMdl[memMdl][hashIdx].memLck); } } - RETVOID; + return; } /* * @@ -5738,7 +5704,7 @@ PUBLIC Void SFlushLkInfo (Void) * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5747,20 +5713,20 @@ PUBLIC Void SFlushLkInfo (Void) * */ #ifdef ANSI -PUBLIC U8 cmMemGetModuleId +uint8_t cmMemGetModuleId ( S8 **funNm, S32 traceSize ) #else -PUBLIC U8 cmMemGetModuleId (funNm, traceSize) +uint8_t cmMemGetModuleId (funNm, traceSize) S8 **funNm; S32 traceSize; #endif /* ANSI */ { - U8 idx; - U8 memStrIdx; - U32 len; + uint8_t idx; + uint8_t memStrIdx; + uint32_t len; S32 retVal; S16 memReqIdx; S16 mdlFunStrIdx; @@ -5768,7 +5734,6 @@ S32 traceSize; Txt *memFn[]={"SGetMsg", "SGetSBuf", "SGetDBuf", NULLP}; /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC3(cmMemGetModuleId) for(idx = 0; idx < traceSize; idx++) { memReqIdx = -1; @@ -5788,7 +5753,7 @@ S32 traceSize; funNm); if(memReqIdx >= 0) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } @@ -5799,13 +5764,13 @@ S32 traceSize; (const S8 *)memUsrMdlStr[mdlFunStrIdx].fPStr); if(retVal == NULLD) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } } - RETVALUE(0); + return (0); } /* cmMemGetModuleId */ /* @@ -5815,7 +5780,7 @@ S32 traceSize; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5824,29 +5789,28 @@ S32 traceSize; * */ #ifdef ANSI -PUBLIC S16 cmMemGetStrMtchIdx +S16 cmMemGetStrMtchIdx ( -U8 strtIdx, -U8 endIdx, +uint8_t strtIdx, +uint8_t endIdx, S8 *str, S8 **strLst ) #else -PUBLIC S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) -U8 strtIdx; -U8 endIdx; +S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) +uint8_t strtIdx; +uint8_t endIdx; S8 *str; S8 **strLst; #endif { S8 cmpStr[255]; - U32 len; + uint32_t len; Bool found; - U32 tempLen; - U8 idx; + uint32_t tempLen; + uint8_t idx; S32 retVal; - TRC3(cmMemGetStrMtchIdx); len = strlen((const S8 *)str); cmpStr[0] = '('; @@ -5876,9 +5840,9 @@ S8 **strLst; if(!found) { - RETVALUE(-1); + return (-1); } - RETVALUE(strtIdx); + return (strtIdx); } /* cmMemGetStrMtchIdx */ #ifdef SS_MEM_LEAK_SOL @@ -5889,7 +5853,7 @@ S8 **strLst; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5898,14 +5862,14 @@ S8 **strLst; * */ #ifdef ANSI -PUBLIC S32 cmAddrToSymStr +S32 cmAddrToSymStr ( Void *pc, S8 *buffer, S32 size ) #else -PUBLIC S32 cmAddrToSymStr(pc, buffer, size) +S32 cmAddrToSymStr(pc, buffer, size) Void *pc; S8 *buffer; S32 size; @@ -5915,24 +5879,23 @@ S32 size; Dl_info info; Sym *sym; - TRC3(cmAddrToSymStr); if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { - RETVALUE(snprintf(buffer, size, "[0x%p]", pc)); + return (snprintf(buffer, size, "[0x%p]", pc)); } if ((info.dli_fname != NULLP && info.dli_sname != NULLP) && ((uintptr_t)pc - (uintptr_t)info.dli_saddr < sym->st_size)) { - RETVALUE(snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", + return (snprintf(buffer, size, "%s(%s+0x%x) [0x%p]", info.dli_fname, info.dli_sname, (unsigned long)pc - (unsigned long)info.dli_saddr, pc)); } else { - RETVALUE(snprintf(buffer, size, "%s(0x%p [0x%p]", + return (snprintf(buffer, size, "%s(0x%p [0x%p]", info.dli_fname, (unsigned long)pc - (unsigned long)info.dli_fbase, pc)); } @@ -5946,7 +5909,7 @@ S32 size; * Desc: Initializes the memory leak detection module * * -* Ret: RETVOID +* Ret: void * * Notes: This function initializes the memory leak detection module. * @@ -5955,29 +5918,28 @@ S32 size; * */ #ifdef ANSI -PUBLIC S32 cmLeakCallBack +S32 cmLeakCallBack ( uintptr_t pc, S32 sigNo, Void *arg ) #else -PUBLIC S32 cmLeakCallBack(pc, sigNo, arg) +S32 cmLeakCallBack(pc, sigNo, arg) uintptr_t pc; S32 sigNo; Void *arg; #endif { S8 *buffer; - TRC3(cmLeakCallBack); Backtrace_t *bt = (Backtrace_t *)arg; if (bt->bt_actcount >= bt->bt_maxcount) - RETVALUE(-1); + return (-1); /*cm_mem_c_001.main_27 SSI-4GMX specfic changes*/ #ifdef SS_4GMX_LCORE buffer = (S8 *)MxHeapAlloc(SsiHeap, 510); - cmMemset((U8*)buffer, 0, 510); + memset(buffer, 0, 510); #else buffer = (S8 *)calloc(1, 510); #endif @@ -5985,52 +5947,8 @@ Void *arg; (void) cmAddrToSymStr((void *)pc, buffer, 505); bt->bt_buffer[bt->bt_actcount++] = (S8 *)buffer; - RETVALUE(0); + return (0); } /* cmLeakCallBack */ -#if 0 -/* -* -* Fun: backtrace -* -* Desc: Initializes the memory leak detection module -* -* -* Ret: RETVOID -* -* Notes: This function initializes the memory leak detection module. -* -* -* File: cm_mem.c -* -*/ -#ifdef ANSI -PUBLIC S32 backtrace -( -Void **buffer, -S32 count -) -#else -PUBLIC S32 backtrace(buffer, count) -Void **buffer; -S32 count; -#endif -{ - TRC3(backtrace); - - Backtrace_t bt; - ucontext_t u; - - bt.bt_buffer = buffer; - bt.bt_maxcount = count; - bt.bt_actcount = 0; - - if (getcontext(&u) < 0) - RETVALUE(0); - (Void) walkcontext(&u, cmLeakCallBack, &bt); - RETVALUE(bt.bt_actcount); - -} /* backtrace */ -#endif #endif /* SS_MEM_LEAK_SOL */ #endif /* SS_MEM_LEAK_STS */ @@ -6055,39 +5973,38 @@ S32 count; */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmMmRegIsBlkSane +S16 cmMmRegIsBlkSane ( CmMmBlkHdr *blkPtr, Size size ) #else -PUBLIC S16 cmMmRegIsBlkSane(blkPtr, size) +S16 cmMmRegIsBlkSane(blkPtr, size) CmMmBlkHdr *blkPtr; Size size; #endif #else #ifdef ANSI -PUBLIC S16 cmMmRegIsBlkSane +S16 cmMmRegIsBlkSane ( CmMmBlkHdr *blkPtr ) #else -PUBLIC S16 cmMmRegIsBlkSane(blkPtr) +S16 cmMmRegIsBlkSane(blkPtr) CmMmBlkHdr *blkPtr; #endif #endif { - U32 sigCnt; + uint32_t sigCnt; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 CmMmBlkTail *tailPtr; #endif - TRC2(cmMmRegIsBlkSane); for ( sigCnt=0; sigCnt < CMM_TRAMPLING_SIGNATURE_LEN; sigCnt++) { if (blkPtr->trSignature[sigCnt] != 0xAB) { - RETVALUE(RFAILED); + return RFAILED; } } #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 @@ -6096,11 +6013,11 @@ CmMmBlkHdr *blkPtr; { if (tailPtr->trSignature[sigCnt] != 0xFE) { - RETVALUE(RFAILED); + return RFAILED; } } #endif - RETVALUE(ROK); + return ROK; } #endif #ifdef SSI_DEBUG_LEVEL1 @@ -6125,19 +6042,17 @@ CmMmBlkHdr *blkPtr; * */ #ifdef ANSI -PRIVATE S16 cmMmBktSanityChk +static S16 cmMmBktSanityChk ( CmMmBkt *bkt ) #else -PRIVATE S16 cmMmBktSanityChk(bkt) +static S16 cmMmBktSanityChk(bkt) CmMmBkt *bkt; #endif { CmMmBlkHdr *ptrBlk; - U32 blkCnt; - - TRC2(cmMmBktSanityChk); + uint32_t blkCnt; bkt->trampleCount = 0; @@ -6151,7 +6066,7 @@ CmMmBkt *bkt; if (bkt->trampleCount > CMM_TRAMPLING_THRESHOLD) { /* Take action to invalidate the entire bucket */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } /* reach next memory block in this bucket manually */ @@ -6164,7 +6079,7 @@ CmMmBkt *bkt; SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -6187,27 +6102,26 @@ CmMmBkt *bkt; * */ #ifdef ANSI -PRIVATE S16 cmMmHeapSanityChk +static S16 cmMmHeapSanityChk ( CmMmHeapCb *heapCb ) #else -PRIVATE S16 cmMmHeapSanityChk(heapCb) +static S16 cmMmHeapSanityChk(heapCb) CmMmHeapCb *heapCb; #endif { - TRC2(cmMmHeapSanityChk); /* increment the trample count */ heapCb->trampleCount++; if (heapCb->trampleCount > CMM_TRAMPLING_THRESHOLD) { - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* * @@ -6226,24 +6140,23 @@ CmMmHeapCb *heapCb; * */ #ifdef ANSI -PRIVATE S16 cmMmHashFunc +static S16 cmMmHashFunc ( CmMmHashListCp *hashListCp, -U32 key, -U16 *idx +uint32_t key, +uint16_t *idx ) #else -PRIVATE S16 cmMmHashFunc (hashListCp, key, idx) +static S16 cmMmHashFunc (hashListCp, key, idx) CmMmHashListCp *hashListCp; /* hash list control point */ -U32 key; /* key string */ -U16 *idx; /* idx to return */ +uint32_t key; /* key string */ +uint16_t *idx; /* idx to return */ #endif { - TRC2(cmMmHashFunc); - *idx = (U16)(key % hashListCp->numOfbins); + *idx = (uint16_t)(key % hashListCp->numOfbins); - RETVALUE(ROK); + return ROK; } /* end of cmMmHashFunc () */ @@ -6269,25 +6182,24 @@ U16 *idx; /* idx to return */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInit +static S16 cmMmHashListInit ( CmMmHashListCp *hashListCp, /* hash list to initialize */ -U16 nmbBins, /* number of hash list bins */ +uint16_t nmbBins, /* number of hash list bins */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) +static S16 cmMmHashListInit(hashListCp, nmbBins, region, pool) CmMmHashListCp *hashListCp; /* hash list to initialize */ -U16 nmbBins; /* number of hash list bins */ +uint16_t nmbBins; /* number of hash list bins */ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ #endif { - U16 i; + uint16_t i; CmMmHashListEnt *hl; - TRC2(cmMmHashListInit); /* initialize control point fields */ hashListCp->hashList = NULLP; @@ -6299,7 +6211,7 @@ Pool pool; /* memory pool to allocate bins */ { if (SGetSBuf(region, pool, (Data **) &hashListCp->hashList, (Size)(nmbBins * sizeof(CmMmHashListEnt))) != ROK) - RETVALUE(RFAILED); + return RFAILED; /* initialize bin pointers */ hl = hashListCp->hashList; @@ -6312,7 +6224,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = nmbBins; } - RETVALUE(ROK); + return ROK; } /* @@ -6335,20 +6247,19 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListDeinit +static S16 cmMmHashListDeinit ( CmMmHashListCp *hashListCp, /* hash list to deinitialize */ Region region, /* memory region to allocate bins */ Pool pool /* memory pool to allocate bins */ ) #else -PRIVATE S16 cmMmHashListDeinit(hashListCp, region, pool) +static S16 cmMmHashListDeinit(hashListCp, region, pool) CmMmHashListCp *hashListCp; /* hash list to deinitialize */ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ #endif { - TRC2(cmMmHashListDeinit); /* deallocate memory for bins */ if (hashListCp->numOfbins) @@ -6361,7 +6272,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = 0; hashListCp->numOfEntries = 0; - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListDeinit */ /* @@ -6382,30 +6293,29 @@ Pool pool; /* memory pool to allocate bins */ * */ #ifdef ANSI -PRIVATE S16 cmMmHashListInsert +static S16 cmMmHashListInsert ( CmMmHashListCp *hashListCp, /* hash list to add to */ -U32 key /* pointer to key */ +uint32_t key /* pointer to key */ ) #else -PRIVATE S16 cmMmHashListInsert(hashListCp, key) +static S16 cmMmHashListInsert(hashListCp, key) CmMmHashListCp *hashListCp; /* hash list to add to */ -U32 key; /* pointer to key */ +uint32_t key; /* pointer to key */ #endif { CmMmHashListEnt *hashListEnt; /* pointer to hash list entry header */ - U16 idx; /* index for insertion into hash list */ - U16 i; + uint16_t idx; /* index for insertion into hash list */ + uint16_t i; - TRC2(cmMmHashListInsert); /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) - RETVALUE(ROK); + return ROK; /* compute index for insertion */ if (cmMmHashFunc(hashListCp, key, &idx) != ROK) - RETVALUE(RFAILED); + return RFAILED; hashListEnt = hashListCp->hashList; @@ -6441,11 +6351,11 @@ U32 key; /* pointer to key */ if (i == CMM_STAT_HASH_TBL_LEN) { /* there is no free slot for this key */ - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListInsert */ #endif /* SSI_DEBUG_LEVEL1 */ @@ -6467,17 +6377,16 @@ U32 key; /* pointer to key */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListInit +static S16 cmHstGrmHashListInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListInit(hashListCp) +static S16 cmHstGrmHashListInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6489,7 +6398,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6508,17 +6417,16 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmHashListDeInit +static S16 cmHstGrmHashListDeInit ( CmHstGrmHashListCp *hashListCp /* hash list to initialize */ ) #else -PRIVATE S16 cmHstGrmHashListDeInit(hashListCp) +static S16 cmHstGrmHashListDeInit(hashListCp) CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ #endif { /*cm_mem_c_001.main_25 : Fix for TRACE5 feature crash due to missing TRC MACRO*/ - TRC2(cmHstGrmHashListDeInit) #ifdef DEBUGP /* display an error message here */ /*cm_mem_c_001.main_25: Fixed Warnings for 32/64 bit compilation*/ @@ -6530,7 +6438,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6553,30 +6461,29 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFreeInsert +static S16 cmHstGrmFreeInsert ( CmHstGrmHashListCp* hashListCp, /* hash list cp */ -U32 blkSz, /* size of the block freed */ -U32 line, /* Line number */ -U8 *fileName, /* file name */ -U8 entId /* Tapa task which free the memory */ +uint32_t blkSz, /* size of the block freed */ +uint32_t line, /* Line number */ +uint8_t *fileName, /* file name */ +uint8_t entId /* Tapa task which free the memory */ ) #else -PRIVATE S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) +static S16 cmHstGrmFreeInsert(hashListCp, blkSz, line, fileName, entId) CmHstGrmHashListCp* hashListCp; /* hash list cp */ -U32 blkSz; /* size of the block freed */ -U32 line; /* line number */ -U8 *fileName; /* file Name */ -U8 entId; /* Tapa task which frees the memory */ +uint32_t blkSz; /* size of the block freed */ +uint32_t line; /* line number */ +uint8_t *fileName; /* file Name */ +uint8_t entId; /* Tapa task which frees the memory */ #endif { - U32 binIdx = 0; /* Bin index to insert the entry into the hash list */ - U32 key = 0; /* Key to fine the bin index */ - U32 ret = 0; /* Return value */ + uint32_t binIdx = 0; /* Bin index to insert the entry into the hash list */ + uint32_t key = 0; /* Key to fine the bin index */ + uint32_t ret = 0; /* Return value */ CmMemEntries *entry = NULLP; /* Entry which contains the information */ - TRC2(cmHstGrmFreeInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6589,14 +6496,14 @@ U8 entId; /* Tapa task which frees the memory */ { entry->freedBytes += blkSz; entry->bucketFreeReq++; - RETVALUE(ROK); + return ROK; } /* End of if */ /* If hash list is full then print the error tna continue */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN \n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6614,7 +6521,7 @@ U8 entId; /* Tapa task which frees the memory */ /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFreeInsert */ @@ -6636,31 +6543,30 @@ U8 entId; /* Tapa task which frees the memory */ * */ #ifdef ANSI -PRIVATE S16 cmHstGrmAllocInsert +static S16 cmHstGrmAllocInsert ( CmHstGrmHashListCp *hashListCp, -U32 blkSz, -U32 *reqSz, -U32 line, -U8 *fileName, -U8 entId +uint32_t blkSz, +uint32_t *reqSz, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) #else -PRIVATE S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) +static S16 cmHstGrmAllocInsert(hashListCp, blkSz, reqSz, line, fileName, entId) CmHstGrmHashListCp *hashListCp; -U32 blkSz; -U32 *reqSz; -U32 line; -U8 *fileName; -U8 entId; +uint32_t blkSz; +uint32_t *reqSz; +uint32_t line; +uint8_t *fileName; +uint8_t entId; #endif { - U32 binIdx = 0; - U32 key = 0; - U32 ret = 0; + uint32_t binIdx = 0; + uint32_t key = 0; + uint32_t ret = 0; CmMemEntries *entry = NULLP; - TRC2(cmHstGrmAllocInsert); /* check for the total number of entries in the hash list. * * If there is no place for new entry return failure */ @@ -6675,13 +6581,13 @@ U8 entId; entry->allocBytes += blkSz; entry->bucketAllocReq++; entry->wastedBytes += (blkSz - *reqSz); - RETVALUE(ROK); + return ROK; } /* End of if */ if(hashListCp->totalNumEntries == (CMM_HIST_MAX_MEM_BIN * CMM_HIST_MAX_MEM_ENTRY_PER_BIN)) { printf("No place in the hash list. Increase the value of macro CMM_HIST_MAX_MEM_BIN and CMM_HIST_MAX_MEM_ENTRY_PER_BIN\n"); - RETVALUE(RFAILED); + return RFAILED; } /* End of if */ /* Take the address of next free entry in the hash bin */ @@ -6702,7 +6608,7 @@ U8 entId; /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmAllocInsert */ @@ -6724,24 +6630,23 @@ U8 entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmGetHashIdxAndKey +static S16 cmHstGrmGetHashIdxAndKey ( -U8 *fileName, -U32 line, -U32 *binIdx, -U32 *key +uint8_t *fileName, +uint32_t line, +uint32_t *binIdx, +uint32_t *key ) #else -PRIVATE S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) -U8 *fileName; -U32 line; -U32 *binIdx; -U32 *key; +static S16 cmHstGrmGetHashIdxAndKey(fileName, line, binIdx, key) +uint8_t *fileName; +uint32_t line; +uint32_t *binIdx; +uint32_t *key; #endif { - U32 i = 0; - TRC2(cmHstGrmGetHashIdxAndKey); + uint32_t i = 0; /* Calculate the key using file name and line number */ for(i = 0 ; fileName[i] != '\0'; i++) @@ -6750,7 +6655,7 @@ U32 *key; }/* End of for */ *key += line; *binIdx = ( *key % CMM_HIST_MAX_MEM_BIN); - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6774,26 +6679,25 @@ U32 *key; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFillEntry +static S16 cmHstGrmFillEntry ( CmMemEntries *entry, -U32 key, -U32 line, -U8 *fileName, -U8 entId +uint32_t key, +uint32_t line, +uint8_t *fileName, +uint8_t entId ) #else -PRIVATE S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) +static S16 cmHstGrmFillEntry(entry, key, line, fileName, entId) CmMemEntries *entry; -U32 key; -U32 line; -U8 *fileName; -U8 entId; +uint32_t key; +uint32_t line; +uint8_t *fileName; +uint8_t entId; #endif { - U32 idx = 0; - TRC2(cmHstGrmFillEntry); + uint32_t idx = 0; entry->key = key; entry->line = line; entry->entId = entId; @@ -6802,7 +6706,7 @@ U8 entId; entry->fileName[idx] = fileName[idx]; } entry->fileName[idx] = '\0'; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6823,29 +6727,26 @@ U8 entId; * */ #ifdef ANSI -PRIVATE S16 cmHstGrmFindEntry +static S16 cmHstGrmFindEntry ( CmHstGrmHashListCp *hashListCp, -U32 key, -U32 *binIdx, +uint32_t key, +uint32_t *binIdx, CmMemEntries **entry ) #else -PRIVATE S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) +static S16 cmHstGrmFindEntry(hashListCp, key, binIdx, entry) CmHstGrmHashListCp *hashListCp; -U32 key; -U32 *binIdx; +uint32_t key; +uint32_t *binIdx; CmMemEntries **entry; #endif { - U32 numEnt = 0; - U32 numBin = 0; + uint32_t numEnt = 0; + uint32_t numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; - TRC2(cmHstGrmFindEntry); - - for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) { /* find for the entry in the bin */ @@ -6857,7 +6758,7 @@ CmMemEntries **entry; if(tmpBin->entries[numEnt].key == key) { *entry = &(tmpBin->entries[numEnt]); - RETVALUE(ROK); + return ROK; }/* End of if (tmpBin->entries[numEnt].key) */ }/* end of for (numEnt = 0) */ @@ -6880,12 +6781,12 @@ CmMemEntries **entry; else { printf ("Unable to find the entry in hash list\n"); - RETVALUE(RFAILED); + return RFAILED; }/* End of else (numEnt) */ }/* end of for (numBin = 0) */ printf("Unable to find the entry in the hash list\n"); - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHstGrmFindEntry */ #endif /* SS_HISTOGRAM_SUPPORT */