X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_mem.c;h=bd0655a59c215b069c6d9378a7771054a3875649;hb=42f73fef5ef8722af83284e0f146b2da693a1f68;hp=7568e6a39cb5076850ea612cd31ba382d46a1c2f;hpb=aee73991f728cc127d1ed76d5a52571d916235a4;p=o-du%2Fl2.git diff --git a/src/cm/cm_mem.c b/src/cm/cm_mem.c index 7568e6a39..bd0655a59 100755 --- a/src/cm/cm_mem.c +++ b/src/cm/cm_mem.c @@ -135,19 +135,19 @@ 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; +U32 memFreeCount=0; +U32 cmFreeCaller[4]={0}; +U32 cmAllocCaller[4]={0}; +Data *startPtr256=NULLP; +Data *startPtr128=NULLP; +U32 cmMemInfo128[100000][2]={0, 0}; +U32 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]; @@ -462,14 +462,14 @@ 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; @@ -489,7 +489,6 @@ CmMmRegCfg *cfg; CmMmBlkHdr ptrHdr; #endif - TRC2(cmMmRegInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -799,18 +798,17 @@ CmMmRegCfg *cfg; * */ #ifdef ANSI -PUBLIC S16 cmMmRegDeInit +S16 cmMmRegDeInit ( CmMmRegCb *regCb ) #else -PUBLIC S16 cmMmRegDeInit(regCb) +S16 cmMmRegDeInit(regCb) CmMmRegCb *regCb; #endif { U16 bktIdx; - TRC2(cmMmRegDeInit); #if (ERRCLASS & ERRCLS_INT_PAR) @@ -1110,7 +1108,6 @@ Data **prevptr; prevptr=&prevptr1; #endif - TRC2(cmAlloc); #ifndef USE_MEMCAL UNUSED(flags); @@ -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 */ @@ -1575,7 +1572,7 @@ Data **prevptr; /*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 @@ -1704,7 +1701,6 @@ Size size; U16 memIndex=0; #endif - TRC2(cmFree); regCb = (CmMmRegCb *)regionCb; @@ -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)) @@ -2201,7 +2197,6 @@ Size 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); @@ -2251,7 +2246,7 @@ Size size; #ifdef SS_HISTOGRAM_SUPPORT #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2264,7 +2259,7 @@ U8 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; @@ -2278,7 +2273,7 @@ Bool hstReg; #endif #else #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2290,7 +2285,7 @@ U8 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; @@ -2306,7 +2301,7 @@ Bool hstReg; #else #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2317,7 +2312,7 @@ U32 lineNo, U8 *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; @@ -2329,7 +2324,7 @@ U8 *funcName; #else /*SS_LIGHT_MEM_LEAK_STS */ #ifdef SSI_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2338,7 +2333,7 @@ Data **ptr, U32 memType ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, memType) +S16 cmAllocNL(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; U32 flags; @@ -2348,7 +2343,7 @@ U32 memType; #else #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2357,7 +2352,7 @@ Data **ptr, U32 memType ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr, memType) +S16 cmAllocNL(regionCb, size, flags, ptr, memType) Void *regionCb; Size *size; U32 flags; @@ -2366,7 +2361,7 @@ U32 memType; #endif #else #ifdef ANSI -PUBLIC S16 cmAllocNL +S16 cmAllocNL ( Void *regionCb, Size *size, @@ -2374,7 +2369,7 @@ U32 flags, Data **ptr ) #else -PUBLIC S16 cmAllocNL(regionCb, size, flags, ptr) +S16 cmAllocNL(regionCb, size, flags, ptr) Void *regionCb; Size *size; U32 flags; @@ -2413,7 +2408,6 @@ Data **ptr; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmAllocNL); #ifndef USE_MEMCAL UNUSED(flags); @@ -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 @@ -2781,7 +2775,7 @@ Data **ptr; /*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 @@ -2819,7 +2813,7 @@ 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, @@ -2828,7 +2822,7 @@ U32 lineNo, U8 *funcName ) #else -PUBLIC S16 cmFreeNL(regionCb, ptr, size, lineNo, funcName) +S16 cmFreeNL(regionCb, ptr, size, lineNo, funcName) Void *regionCb; Data *ptr; Size size; @@ -2839,7 +2833,7 @@ U8 *funcName; #ifdef SS_HISTOGRAM_SUPPORT #ifdef ANSI -PUBLIC S16 cmFreeNL +S16 cmFreeNL ( Void *regionCb, Data *ptr, @@ -2850,7 +2844,7 @@ U8 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; @@ -2863,14 +2857,14 @@ Bool hstReg; #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; @@ -2897,7 +2891,6 @@ Size size; S8 hstGrmBuf[256]; #endif /* SS_HISTOGRAM_SUPPORT */ - TRC2(cmFreeNL); regCb = (CmMmRegCb *)regionCb; @@ -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)) @@ -3197,7 +3190,6 @@ Size 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); @@ -3248,7 +3240,6 @@ Data **ptr; 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*/ @@ -3323,7 +3314,7 @@ Data **ptr; /*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 @@ -3370,7 +3361,6 @@ Size size; 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; @@ -3442,7 +3432,6 @@ Size size; /* The memory block was allocated from the heap pool */ 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); @@ -3497,7 +3486,6 @@ SMemCtl *memCtl; { CmMmRegCb *regCb; - TRC2(cmCtl); regCb = (CmMmRegCb *)regionCb; @@ -3654,7 +3642,6 @@ U16 *lstMapIdx; #endif #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmBktInit); size = cfg->bktCfg[bktIdx].size; @@ -3888,7 +3875,6 @@ Size size; #ifdef SSI_DEBUG_LEVEL1 U16 idx; #endif /* SSI_DEBUG_LEVEL1 */ - TRC2(cmMmHeapInit); /* Initialize the heap control block */ heapCb->vStart = memAddr; @@ -4062,7 +4048,6 @@ Size *size; 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 */ @@ -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)); @@ -4741,12 +4725,12 @@ Size size; #endif/*USE_PURE*/ #ifdef SS_LIGHT_MEM_LEAK_STS #ifdef ANSI -PUBLIC U32 cmGetFreeIndx +U32 cmGetFreeIndx ( Void ) #else -PUBLIC U32 cmGetFreeIndx(Void) +U32 cmGetFreeIndx(Void) #endif { @@ -4764,12 +4748,12 @@ PUBLIC U32 cmGetFreeIndx(Void) } #ifdef ANSI -PUBLIC U32 cmPutFreeIndx +U32 cmPutFreeIndx ( U32 allocQIndx ) #else -PUBLIC U32 cmPutFreeIndx(allocQIndx) +U32 cmPutFreeIndx(allocQIndx) U32 allocQIndx; #endif @@ -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; - TRC3(cmInitMemLeak); gmemLkCb.isStarted = FALSE; gmemLkCb.head = 0; @@ -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; - TRC3(cmDeinitMemLeak); for(indx = 0; indx < CM_MAX_ALLOC_ENTERIES; indx++) { @@ -4881,12 +4863,12 @@ PUBLIC Void cmDeinitMemLeak (Void) * */ #ifdef ANSI -PUBLIC U32 cmStorAllocBlk +U32 cmStorAllocBlk ( Void *addr ) #else -PUBLIC U32 cmStorAllocBlk (addr) +U32 cmStorAllocBlk (addr) Void *addr; #endif /* ANSI */ @@ -4923,16 +4905,15 @@ Void *addr; * */ #ifdef ANSI -PUBLIC Void cmRlsAllocBlk +Void cmRlsAllocBlk ( U32 allocQIndx ) #else -PUBLIC Void cmRlsAllocBlk(allocQIndx) +Void cmRlsAllocBlk(allocQIndx) U32 allocQIndx; #endif { - TRC3(cmRlsAllocBlk); if(allocQIndx < CM_MAX_ALLOC_ENTERIES) { @@ -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) @@ -4996,12 +4977,12 @@ PUBLIC Void cmStartStopLeakLog(Void) * */ #ifdef ANSI -PUBLIC Void cmPrintLeakLog +Void cmPrintLeakLog ( Void ) #else -PUBLIC Void cmPrintLeakLog(Void) +Void cmPrintLeakLog(Void) #endif { @@ -5009,7 +4990,6 @@ PUBLIC Void cmPrintLeakLog(Void) CmMmBlkHdr *aBkt; static U32 leakCount =0; - TRC3(cmPrintLeakLog); printf("---- START OF LEAK LOG ----"); SLock(&gmemLkCb.memLock); @@ -5057,19 +5037,19 @@ 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 @@ -5078,7 +5058,7 @@ U32 addr #endif ) #else -PUBLIC Void cmRlsAllocBlk(addr) +Void cmRlsAllocBlk(addr) #ifdef BIT_64 U64 addr; #else @@ -5097,7 +5077,6 @@ U32 addr; MemAllocInfo *memAllocInfo; #endif - TRC3(cmRlsAllocBlk); #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef BIT_64 @@ -5238,7 +5217,7 @@ U32 addr; */ #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 #ifdef ANSI -PUBLIC Void cmStorAllocBlk +Void cmStorAllocBlk ( CmMmBlkHdr *ptrHdr, Size reqSz, @@ -5247,7 +5226,7 @@ U16 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; @@ -5256,7 +5235,7 @@ CmMmRegCb *regCb; #endif #else #ifdef ANSI -PUBLIC Void cmStorAllocBlk +Void cmStorAllocBlk ( #ifdef BIT_64 U64 addr, @@ -5268,7 +5247,7 @@ Size allocSz, U16 bktIdx ) #else -PUBLIC Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) +Void cmStorAllocBlk (addr, reqSz, allocSz, bktIdx) #ifdef BIT_64 U64 addr; #else @@ -5292,7 +5271,6 @@ U16 bktIdx; S32 traceSize; #endif - TRC3(cmStorAllocBlk); #ifndef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL2 if( memLkCb.memLkMdlInit == FALSE) { @@ -5306,7 +5284,7 @@ U16 bktIdx; /*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)); + memset(funcNm, 0, (sizeof(U32) * CM_MAX_STACK_TRACE)); #else funcNm = (S8 **)calloc(1, (sizeof(U32) * CM_MAX_STACK_TRACE)); #endif @@ -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 @@ -5384,12 +5362,12 @@ 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 @@ -5402,7 +5380,6 @@ PUBLIC Void SLogLkInfo (Void) CmMmRegCb *tmpRegCb; FILE *fp; - TRC3(SLogLkInfo); fp = fopen("meLeakLog.txt", "w"); if(fp == NULL) { @@ -5460,7 +5437,6 @@ PUBLIC Void SLogLkInfo (Void) U8 idx; Txt prntBuf[255]; S8 **funcNm; - TRC3(SLogLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5543,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; - TRC3(cmInitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5592,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; - TRC3(cmDeinitMemLeakMdl); memLkCb.memLkMdlInit = FALSE; for(memMdl = 0; memMdl < CM_MEM_USR_MDL; memMdl++) @@ -5633,16 +5607,15 @@ 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; @@ -5663,12 +5636,12 @@ S8 *msOptArg; * */ #ifdef ANSI -PUBLIC Void SFlushLkInfo +Void SFlushLkInfo ( Void ) #else -PUBLIC Void SFlushLkInfo (Void) +Void SFlushLkInfo (Void) #endif { MemAllocInfo *newMemInfo; @@ -5679,7 +5652,6 @@ PUBLIC Void SFlushLkInfo (Void) U8 i; #endif /* SS_MEM_LEAK_SOL */ - TRC3(SFlushLkInfo); if( memLkCb.memLkMdlInit == FALSE) { RETVOID; @@ -5741,13 +5713,13 @@ PUBLIC Void SFlushLkInfo (Void) * */ #ifdef ANSI -PUBLIC U8 cmMemGetModuleId +U8 cmMemGetModuleId ( S8 **funNm, S32 traceSize ) #else -PUBLIC U8 cmMemGetModuleId (funNm, traceSize) +U8 cmMemGetModuleId (funNm, traceSize) S8 **funNm; S32 traceSize; #endif /* ANSI */ @@ -5762,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; @@ -5818,7 +5789,7 @@ S32 traceSize; * */ #ifdef ANSI -PUBLIC S16 cmMemGetStrMtchIdx +S16 cmMemGetStrMtchIdx ( U8 strtIdx, U8 endIdx, @@ -5826,7 +5797,7 @@ S8 *str, S8 **strLst ) #else -PUBLIC S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) +S16 cmMemGetStrMtchIdx(strtIdx, endIdx, str, strLst) U8 strtIdx; U8 endIdx; S8 *str; @@ -5840,7 +5811,6 @@ S8 **strLst; U32 tempLen; U8 idx; S32 retVal; - TRC3(cmMemGetStrMtchIdx); len = strlen((const S8 *)str); cmpStr[0] = '('; @@ -5892,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; @@ -5909,7 +5879,6 @@ S32 size; Dl_info info; Sym *sym; - TRC3(cmAddrToSymStr); if (dladdr1(pc, &info, (Void **)&sym, RTLD_DL_SYMENT) == 0) { @@ -5949,21 +5918,20 @@ 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) @@ -5971,7 +5939,7 @@ Void *arg; /*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 @@ -6005,24 +5973,24 @@ Void *arg; */ #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 @@ -6031,7 +5999,6 @@ CmMmBlkHdr *blkPtr; #ifdef BRDCM_SSI_MEM_LEAK_DEBUG_LEVEL1 CmMmBlkTail *tailPtr; #endif - TRC2(cmMmRegIsBlkSane); for ( sigCnt=0; sigCnt < CMM_TRAMPLING_SIGNATURE_LEN; sigCnt++) { @@ -6087,8 +6054,6 @@ CmMmBkt *bkt; CmMmBlkHdr *ptrBlk; U32 blkCnt; - TRC2(cmMmBktSanityChk); - bkt->trampleCount = 0; /* scan the entire memory list of the bucket */ @@ -6147,7 +6112,6 @@ CmMmHeapCb *heapCb; #endif { - TRC2(cmMmHeapSanityChk); /* increment the trample count */ heapCb->trampleCount++; @@ -6189,7 +6153,6 @@ U32 key; /* key string */ U16 *idx; /* idx to return */ #endif { - TRC2(cmMmHashFunc); *idx = (U16)(key % hashListCp->numOfbins); @@ -6237,7 +6200,6 @@ Pool pool; /* memory pool to allocate bins */ U16 i; CmMmHashListEnt *hl; - TRC2(cmMmHashListInit); /* initialize control point fields */ hashListCp->hashList = NULLP; @@ -6298,7 +6260,6 @@ Region region; /* memory region to allocate bins */ Pool pool; /* memory pool to allocate bins */ #endif { - TRC2(cmMmHashListDeinit); /* deallocate memory for bins */ if (hashListCp->numOfbins) @@ -6347,7 +6308,6 @@ U32 key; /* pointer to key */ U16 idx; /* index for insertion into hash list */ U16 i; - TRC2(cmMmHashListInsert); /* check if hashListCp is initialised yet */ if ( hashListCp->numOfbins == 0) @@ -6427,7 +6387,6 @@ 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*/ @@ -6468,7 +6427,6 @@ 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*/ @@ -6526,7 +6484,6 @@ U8 entId; /* Tapa task which frees the memory */ 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 */ @@ -6610,7 +6567,6 @@ U8 entId; U32 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 */ @@ -6691,7 +6647,6 @@ U32 *key; { U32 i = 0; - TRC2(cmHstGrmGetHashIdxAndKey); /* Calculate the key using file name and line number */ for(i = 0 ; fileName[i] != '\0'; i++) @@ -6743,7 +6698,6 @@ U8 entId; { U32 idx = 0; - TRC2(cmHstGrmFillEntry); entry->key = key; entry->line = line; entry->entId = entId; @@ -6793,9 +6747,6 @@ CmMemEntries **entry; U32 numBin = 0; CmHstGrmHashListEnt *tmpBin = NULLP; - TRC2(cmHstGrmFindEntry); - - for(numBin = 0; numBin < CMM_HIST_MAX_MEM_BIN; numBin++) { /* find for the entry in the bin */