X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcm%2Fcm_mem_wl.c;h=c569224a421fe30fc6401572bf81f9a25b6b7b75;hb=4d45b914f9e94203603d3b9fdbcb1aad361301dd;hp=302cce37579e56e7232fdb4e8879fe8f8f0e4673;hpb=829bbd114f1c3dc00c1da47bca0a8207c049df3f;p=o-du%2Fl2.git diff --git a/src/cm/cm_mem_wl.c b/src/cm/cm_mem_wl.c index 302cce375..c569224a4 100755 --- a/src/cm/cm_mem_wl.c +++ b/src/cm/cm_mem_wl.c @@ -284,73 +284,6 @@ PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); #endif PRIVATE S16 cmCtl ARGS((Void *regionCb, Event event, SMemCtl *memCtl)); PRIVATE Void cmMmHeapInit ARGS((Data *memAddr, CmMmHeapCb *heapCb, Size size)); -#if 0 -#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)); -/*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)); -#endif /* SSI_DEBUG_LEVEL1 */ - -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size, U32 line, - U8 *fileName, U8 entId, Bool hstReg)); - -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size, - U32 line, U8 *fileName, U8 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)); -#else -PRIVATE S16 cmHeapAlloc ARGS((CmMmHeapCb *heapCb, Data **ptr, Size *size)); -#endif /* SSI_DEBUG_LEVEL1 */ -PRIVATE S16 cmHeapFree ARGS((CmMmHeapCb *heapCb, Data *ptr, Size size)); -/* cm_mem_c_001.main_15 :Additions */ -#ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr, U32 memType)); -#else -PRIVATE S16 cmAlloc ARGS((Void *regionCb, Size *size, U32 flags, Data **ptr)); -#endif /* SSI_DEBUG_LEVEL1 */ -PRIVATE S16 cmFree ARGS((Void *regionCb, Data *ptr, Size size)); -#endif /* SS_HISTOGRAM_SUPPORT */ - -/*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)); -#endif - - -PRIVATE Void cmMmBktInit ARGS((Data **memAddr, CmMmRegCb *regCb, - CmMmRegCfg *cfg, U16 bktIdx, U16 *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, - Region region, Pool pool)); -PRIVATE S16 cmMmHashListDeinit ARGS((CmMmHashListCp *hashListCp, Region region, Pool pool)); -PRIVATE S16 cmMmHashListInsert ARGS((CmMmHashListCp *hashListCp, U32 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)); -#endif /* SS_HISTOGRAM_SUPPORT */ -#endif /* cm_mem_c_001.main_22: Fixing warnings on GCC compiler */ #ifdef __cplusplus @@ -402,9 +335,6 @@ PRIVATE Txt dbgPrntBuf[200]; /* print buffer */ U32 num_times = 0; EXTERN pthread_t tmpRegTidMap[20]; -#if 0 -EXTERN pthread_t tmpMainTid; -#endif extern Bool g_usettitmr; PUBLIC void DumpLayersDebugInformation() { @@ -433,8 +363,10 @@ PUBLIC void DumpLayersDebugInformation() #else //DumpPDCPDlDebugInformation(); //DumpPDCPUlDebugInformation(); +#ifndef ODU_TEST_STUB DumpRLCDlDebugInformation(); DumpRLCUlDebugInformation(); +#endif //printSchCellInfo(); #endif } @@ -653,14 +585,14 @@ CmMmRegCfg *cfg; /* 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) && @@ -669,7 +601,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; } /* @@ -695,7 +627,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) @@ -706,7 +638,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) /\ @@ -722,7 +654,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; } @@ -735,7 +667,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; @@ -853,127 +785,12 @@ CmMmRegCfg *cfg; /* Call SRegRegion to register the memory region with SSI */ if (SRegRegion(region, ®Cb->regInfo) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegInit*/ -#if 0 -/* -* -* Fun: ssPutDynBufSet -* -* Desc: Puts the set of dynamic buffers into the global region -* -* -* Ret: ROK - successful, -* RFAILED - unsuccessful. -* -* Notes: -* -* File: cm_mem_wl.c -* -*/ -#ifdef ANSI -PUBLIC S16 ssPutDynBufSet -( -U8 bktIdx, -CmMmBktLstCb *bktLstCb -) -#else -PUBLIC S16 ssPutDynBufSet(bktIdx, bktLstCb) -U8 bktIdx; -CmMmBktLstCb *bktLstCb; -#endif -{ - CmMmGlobRegCb *globReg; - CmMmDynBktCb *bktCb; - - TRC1(ssPutDynBufSet); - - globReg = &osCp.globRegCb; - - if(bktIdx > CMM_MAX_BKT_ENT) - { - RETVALUE(RFAILED); - } - - bktCb = &(globReg->bktTbl[bktIdx]); - - /* Lock the global region first */ - SLock(&(globReg->regLock)); - - cmLListAdd2Tail(&(bktCb->listBktSet), bktLstCb); - - SUnlock(&(globReg->regLock)); - - RETVALUE(ROK); -} - -/* -* -* Fun: ssGetDynBufSet -* -* Desc: Gets the set of dynamic buffers into the global region -* -* -* Ret: ROK - successful, -* RFAILED - unsuccessful. -* -* Notes: -* -* File: cm_mem_wl.c -* -*/ -#ifdef ANSI -PUBLIC S16 ssGetDynBufSet -( -U8 bktIdx, -CmMmBktLstCb **bktLstCb -) -#else -PUBLIC S16 ssGetDynBufSet(bktIdx, bktLstCb) -U8 bktIdx; -CmMmBktLstCb **bktLstCb; -#endif -{ - CmMmGlobRegCb *globReg; - CmMmDynBktCb *bktCb; - CmLList *lstNode; - - TRC1(ssGetDynBufSet); - - globReg = &osCp.globRegCb; - - if(bktIdx > CMM_MAX_BKT_ENT) - { - RETVALUE(RFAILED); - } - - *bktLstCb = NULLP; - bktCb = &(globReg->bktTbl[bktIdx]); - - /* Lock the global region first */ - SLock(&(globReg->regLock)); - - lstNode = cmLListFirst(&(bktCb->listBktSet)); - - if(lstNode == NULLP) - { - SUnlock(&(globReg->regLock)); - RETVALUE(RFAILED); - } - - cmLListDelFrm(&(bktCb->listBktSet), lstNode); - SUnlock(&(globReg->regLock)); - - *bktLstCb = (CmMmBktLstCb *)lstNode->node; - - RETVALUE(ROK); -} -#endif - /* * @@ -1022,7 +839,7 @@ CmMmGlobRegCb *regCb; #ifdef SS_MEM_WL_DEBUG if (cmInitBtInfo() == RFAILED) { - RETVALUE(RFAILED); + return RFAILED; } #endif for ( bktIdx = 0; bktIdx < regCb->numBkts; bktIdx++) @@ -1061,7 +878,7 @@ CmMmGlobRegCb *regCb; *next = NULLP; } - RETVALUE(ROK); + return ROK; } /* end of cmMmGlobRegInit*/ #ifdef SS_USE_ICC_MEMORY @@ -1124,7 +941,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SLock(&iccAllocFreeLock)) != ROK) { printf("cmIccAllocWithLock: Failed to get the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } memPtr = (Data *)TL_Alloc(regCb->iccHdl, *size); @@ -1132,7 +949,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SUnlock(&iccAllocFreeLock)) != ROK) { printf("cmIccAllocWithLock: Failed to unlock the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } if ((memPtr) == NULLP) @@ -1154,7 +971,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #endif *ptr = memPtr; - RETVALUE(ROK); + return ROK; } /* end of cmIccAllocWithLock */ @@ -1213,7 +1030,7 @@ Size size; /* Size of the block */ if((SLock(&iccAllocFreeLock)) != ROK) { printf("cmIccFreeWithLock: Failed to get the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } #ifdef T2K_MEM_LEAK_DBG @@ -1225,10 +1042,10 @@ Size size; /* Size of the block */ if((SUnlock(&iccAllocFreeLock)) != ROK) { printf("cmIccFreeWithLock: Failed to unlock the ICC lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmIccFree */ /* @@ -1309,7 +1126,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = memPtr; /*TL_VA2TRUEVA(regCb->iccHdl, memPtr); */ #endif - RETVALUE(ROK); + return ROK; } /* end of cmIccAlloc */ @@ -1375,13 +1192,8 @@ Size size; /* Size of the block */ #endif /*TL_Free(regCb->iccHdl, ptr);*/ -#if 0 - if(a < 10) - printf("FREE -ICC Addr Before PA2VA %x After PA2VA %x\n", memPtr, ptr); - a++; -#endif - RETVALUE(ROK); + return ROK; } /* end of cmIccFree */ /* @@ -1433,12 +1245,6 @@ CmMmDynRegCb *regCb; #ifdef T2200_2GB_DDR_CHANGES sprintf(regIccStr, "RxID=%d", (regCb->region + 1)); #else -#if 0 - sprintf(regIccStr, "RxID=%d", (regCb->region + 1)); -#else - //snprintf(regIccStr, sizeof(regIccStr), "QueueSize=%u RxID=%u", 1024, (regCb->region + 1)); - - // snprintf(regIccStr, sizeof(regIccStr), "QueueSize=%u RxID=%u", 2048, (regCb->region + 1)); #ifdef L2_L3_SPLIT if(clusterMode == RADIO_CLUSTER_MODE) { @@ -1463,7 +1269,6 @@ CmMmDynRegCb *regCb; sprintf (regIccStr, "queuesize=%d rxid=%d", 512, (regCb->region) + 1); #endif #endif -#endif #endif printf(" %s \n",regIccStr); regCb->iccHdl = TL_Open(regIccStr, 0); @@ -1493,10 +1298,10 @@ CmMmDynRegCb *regCb; if (SRegDynRegion(regCb->region, ®Info) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmDynRegInit*/ #else /* SS_USE_ICC_MEMORY */ @@ -1591,22 +1396,6 @@ CmMmDynRegCb *regCb; } /* Initialize the bucket structure */ -#if 0 - regCb->bktTbl[bktIdx].numAlloc = 0; - regCb->bktTbl[bktIdx].maxAlloc = 0; - - /* Update the total bucket size */ - regCb->bktSize += (regCb->bktTbl[bktIdx].size * regCb->bktTbl[bktIdx].numBkt); - - regCb->bktTbl[bktIdx].bktFailCnt = 0; - regCb->bktTbl[bktIdx].bktNoFitCnt = 0; - - if(regCb->bktMaxBlkSize < regCb->bktTbl[bktIdx].size) - { - regCb->bktMaxBlkSize = regCb->bktTbl[bktIdx].size; - } -#endif - for(idx = 0; idx < numBkts; idx++) { regCb->bktTbl[idx].crntMemBlkSetElem = NULLP; @@ -1621,7 +1410,6 @@ CmMmDynRegCb *regCb; /* Call SRegRegion to register the memory region with SSI */ cmMemset((U8*)®Info, 0, sizeof(regInfo)); -#if 1 if((SS_MAX_REGS - 1) == regCb->region) { regInfo.alloc = cmDynAllocWithLock; @@ -1632,36 +1420,19 @@ CmMmDynRegCb *regCb; } } else -#endif { -#if 0 - static dynLockCreated; - regInfo.alloc = cmDynAllocWithLock; - regInfo.free = cmDynFreeWithLock; - if ( dynLockCreated == 0) - { - if((SInitLock((&dynAllocFreeLock), SS_LOCK_MUTEX)) != ROK) - { - printf("Failed to initialize the lock region lock\n"); - } - dynLockCreated = 1; - } -#endif - -#if 1 regInfo.alloc = cmDynAlloc; regInfo.free = cmDynFree; -#endif } regInfo.regCb = regCb; if (SRegDynRegion(region, ®Info) != ROK) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } /* end of cmMmDynRegInit*/ #endif /* SS_USE_ICC_MEMORY */ @@ -1711,7 +1482,7 @@ CmMmRegCb *regCb; /* error check on parameters */ if (regCb == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -1721,7 +1492,7 @@ 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 */ @@ -1765,7 +1536,7 @@ CmMmRegCb *regCb; #endif } - RETVALUE(ROK); + return ROK; } /* end of cmMmRegDeInit */ @@ -1820,13 +1591,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* Check if the element exits or not */ if((memSetNode == NULLP) || (memSetNode->node == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } bkt->crntMemBlkSetElem = (CmMmBlkSetElement *)memSetNode->node; /* Get the new block set from the gloabl region and return the same */ ssGetDynMemBlkSet(bucketIndex, bkt->crntMemBlkSetElem, 0); - RETVALUE(bkt->crntMemBlkSetElem); + return (bkt->crntMemBlkSetElem); } /* If this is not the first time, take the bucket list CB from the * current index */ @@ -1848,19 +1619,13 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* if next node also empty, return failure */ if(memBlkSetElem->numFreeBlks == 0) { - RETVALUE(NULLP); + return (NULLP); } /* store the new index in the current node which will be * used in the next time. */ bkt->crntMemBlkSetElem = memBlkSetElem; } -#if 0 - if(memBlkSetElem->nextBktPtr == NULLP) - { - ssGetDynMemBlkSet(bucketIndex, memBlkSetElem); - } -#endif /* If we have reached the threshold value, get the next set of buckets from * the global region and place it */ if(memBlkSetElem->numFreeBlks < bkt->blkSetAcquireThreshold) @@ -1897,7 +1662,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ } /* On successful, return the bucket node to calling function */ - RETVALUE(memBlkSetElem); + return (memBlkSetElem); } /* cmGetMemBlkSetForAlloc */ @@ -1949,10 +1714,10 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* Check if the element exits or not */ if((memSetNode == NULLP) || (memSetNode->node == NULLP)) { - RETVALUE(NULLP); + return (NULLP); } bkt->crntMemBlkSetElem = (CmMmBlkSetElement *)memSetNode->node; - RETVALUE(bkt->crntMemBlkSetElem); + return (bkt->crntMemBlkSetElem); } /* If this is not the first time, take the bucket list CB from the * current index */ @@ -1974,7 +1739,7 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ /* if next node also empty, return failure */ if(memBlkSetElem->numFreeBlks >= bkt->bucketSetSize) { - RETVALUE(NULLP); + return (NULLP); } /* store the new index in the current node which will be * used in the next time. */ @@ -2011,15 +1776,11 @@ CmMmDynBktCb *bkt; /* Bucket list control block */ */ ssPutDynMemBlkSet(bucketIndex, nextMemBlkSetElem, (bkt->bucketSetSize - memBlkSetElem->numFreeBlks - 1)); -#if 0 - nextMemBlkSetElem->numFreeBlks = 0; - nextMemBlkSetElem->nextBktPtr = NULLP; -#endif } } /* On successful, return the bucket node to calling function */ - RETVALUE(memBlkSetElem); + return (memBlkSetElem); } #endif /* SS_USE_ICC_MEMORY */ #endif /* USE_PURE */ @@ -2077,18 +1838,18 @@ PTR ptr; printf("Analysis from Array storing BT for freeing and allocation\n"); cmAnalyseBtInfo(ptr, regionCb->region); SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } if((cmHashListDelete(&(memDoubleFree), (PTR)memNode)) != ROK) { SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } SUnlock(&memDoubleFreeLock); SPutSBuf(regionCb->region, 0, (Data *)memNode, sizeof(CmMemDoubleFree)); - RETVALUE(ROK); + return ROK; } /* @@ -2126,7 +1887,7 @@ PTR ptr; SGetSBuf(regionCb->region, 0, (Data **)&memNode, sizeof(CmMemDoubleFree)); if(memNode == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } memNode->memBlkPtr = ptr; @@ -2135,11 +1896,11 @@ PTR ptr; sizeof(PTR))) != ROK) { SUnlock(&memDoubleFreeLock); - RETVALUE(RFAILED); + return RFAILED; } SUnlock(&memDoubleFreeLock); - RETVALUE(ROK); + return ROK; } #endif @@ -2185,7 +1946,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SLock(&dynAllocFreeLock)) != ROK) { printf("cmDynAllocWithLock: Failed to get the dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmDynAlloc (regionCb, size,flags,ptr); @@ -2193,10 +1954,10 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ if((SUnlock(&dynAllocFreeLock)) != ROK) { printf("cmDynAllocWithLock: Failed to unlock the Dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* end of cmDynAlloc */ /* @@ -2250,7 +2011,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2284,12 +2045,12 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ { printf("Failed to get the buffer of size %d\n", *size); /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif if (idx > 512) { - RETVALUE(RFAILED); + return RFAILED; } /* Dequeue the memory block and return it to the user */ bktIdx = regCb->mapTbl[idx].bktIdx; @@ -2314,7 +2075,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #else printf("Failed to get the buffer of size %d\n", *size); #endif - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MEM_WL_DEBUG @@ -2328,18 +2089,13 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = dynMemElem->nextBktPtr; if (*ptr == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } dynMemElem->nextBktPtr = *((CmMmEntry **)(*ptr)); dynMemElem->numFreeBlks--; #ifdef SS_MEM_WL_DEBUG prvAllocPtr[regCb->region] = *ptr; -#if 0 - if(regCb->region == 6) - printf("cmDynAlloc: PTR = %x\n", *ptr); - **ptr = (U32) ((bktIdx << 4) | 0x0f); -#endif **ptr = (U8) bktIdx; *(*ptr+1) = 0xde; @@ -2358,9 +2114,6 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ btInfo->btInfo[btIdx].btSize = backtrace(btInfo->btInfo[btIdx].btArr, NUM_BT_TRACES); } gettimeofday(&(btInfo->btInfo[btIdx].timeStamp), NULLP); -#if 0 - cmInsertAllocPtrToList(regCb, (PTR)*ptr); -#endif btIdx++; btIdx &= (NUM_FREE_BUFFERS - 1); @@ -2372,7 +2125,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ } #endif - RETVALUE(ROK); + return ROK; } /* If the size is not matching, return failure to caller */ @@ -2381,7 +2134,7 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ #else printf("Failed to get the buffer of size %d\n", *size); #endif - RETVALUE(RFAILED); + return RFAILED; #else /* use pure is on */ @@ -2394,9 +2147,9 @@ Data **ptr; /* Reference to pointer for which need to be allocate */ *ptr = (Data *)malloc(*size); if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; /* avail_size -= *size; */ - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmDynAlloc */ @@ -2589,7 +2342,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2598,7 +2351,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 */ @@ -2642,7 +2395,7 @@ Data **ptr; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -2719,7 +2472,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -2731,7 +2484,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif /* return RFAILED */ - RETVALUE(RFAILED); + return RFAILED; } } } @@ -2766,10 +2519,6 @@ Data **ptr; /*printf("cmAlloc: bktIdx %u overused %u numAlloc %u\n", bktIdx, g_overused[bktIdx], bkt->numAlloc); */ } } -#if 0 - if(bkt->numAlloc < 100) - printf("cmAlloc: Allocated PTR = %x size = %d\n", *ptr, *size); -#endif /* cm_mem_c_001.main_12 - addition for header manipulation */ #ifdef SSI_DEBUG_LEVEL1 @@ -2849,7 +2598,7 @@ Data **ptr; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else if (flags) { @@ -2916,22 +2665,22 @@ 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, 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 @@ -2941,9 +2690,9 @@ Data **ptr; *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 */ @@ -2983,11 +2732,11 @@ PUBLIC S16 cmInitDoubleFreeList() if((cmHashListInit(&(memDoubleFree), 1000, offset, 0, CM_HASH_KEYTYPE_U32MOD, 0, 0)) != ROK); { - RETVALUE(RFAILED); + return RFAILED; } SInitLock(&memDoubleFreeLock, SS_LOCK_MUTEX); - RETVALUE(ROK); + return ROK; } #ifdef SS_MEM_WL_DEBUG @@ -3018,15 +2767,15 @@ PRIVATE S16 cmInitBtInfo (Void) regBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); if (regBtInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } allocBtInfo = (CmBtInfo *)calloc(1, 8 * sizeof (CmBtInfo)); if(allocBtInfo == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ROK); + return ROK; } #endif /* SS_MEM_WL_DEBUG */ /* @@ -3062,44 +2811,6 @@ U32 idx; CmBtInfo *btInfo; U8 regIdx; -#if 0 - for(regIdx = 0; regIdx < 8; regIdx++) - { - btInfo = & regBtInfo[regIdx]; - btIdx = btInfo->btInfoIdx; - - for (tmpCnt = 0; tmpCnt < NUM_FREE_BUFFERS; tmpCnt++) - { -#if 0 - if ((btInfo->btInfo[btIdx].ptr >= ptr) && - (btInfo->btInfo[btIdx].ptr + 128 ) >= ptr) - -#endif - if(btInfo->btInfo[btIdx].btSize != 0) - { - U32 i; - char **strings; - strings = backtrace_symbols( btInfo->btInfo[btIdx].btArr,btInfo->btInfo[btIdx].btSize); - printf("*** Last Free Region = %d PTR %x Timestamp sec = (%ld) usec = (%ld) ***\n", idx, ptr, btInfo->btInfo[btIdx].timeStamp.tv_sec, btInfo->btInfo[btIdx].timeStamp.tv_usec); - for (i=0; i < btInfo->btInfo[btIdx].btSize; i++) - { - printf("%s\n", strings[i]); - } - printf("*******************************************************\n"); - - free(strings); - } - - btIdx--; - if (btIdx == 0) - { - btIdx = NUM_FREE_BUFFERS - 1; - } - } - } -#endif - - /* for(regIdx = 0; regIdx < 8; regIdx++) { */ idx = 2; @@ -3173,7 +2884,7 @@ Size size; /* Size of the block */ if((SLock(&dynAllocFreeLock)) != ROK) { printf("dynAllocWithLock: Failed to get the DYN lock\n"); - RETVALUE(RFAILED); + return RFAILED; } ret = cmDynFree(regionCb, ptr,size); @@ -3181,10 +2892,10 @@ Size size; /* Size of the block */ if((SUnlock(&dynAllocFreeLock)) != ROK) { printf("dynAllocWithLock: Failed to unlock the dyn lock\n"); - RETVALUE(RFAILED); + return RFAILED; } - RETVALUE(ret); + return (ret); } /* end of cmDynFree */ @@ -3245,19 +2956,19 @@ Size size; /* Size of the block */ /* 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; } /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3275,7 +2986,7 @@ Size size; /* Size of the block */ if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3311,7 +3022,7 @@ Size size; /* Size of the block */ /* Check if the bucket index, if its not valid, return failure */ if(dynMemElem == NULLP) { - RETVALUE(RFAILED); + return RFAILED; } #ifdef SS_MEM_WL_DEBUG @@ -3335,9 +3046,6 @@ Size size; /* Size of the block */ { btInfo->btInfo[btIdx].btSize = backtrace(btInfo->btInfo[btIdx].btArr, NUM_BT_TRACES); } -#if 0 - cmRemoveAllocPtrFromList(regCb, (ptr + sizeof(U32))); -#endif gettimeofday(&(btInfo->btInfo[btIdx].timeStamp), NULLP); btIdx++; @@ -3362,7 +3070,7 @@ Size size; /* Size of the block */ dynMemElem->nextBktPtr = ptr; dynMemElem->numFreeBlks++; - RETVALUE(ROK); + return ROK; #else /* use pure is on */ TRC2(cmDynFree); @@ -3375,7 +3083,7 @@ Size size; /* Size of the block */ /* avail_size += size; */ free(ptr); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3486,19 +3194,19 @@ 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; } /* cm_mem_c_001.main_20 Addition */ if (ptr < regCb->regInfo.start) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3523,7 +3231,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3590,7 +3298,7 @@ Size size; (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else { @@ -3606,7 +3314,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } @@ -3638,7 +3346,7 @@ Size size; #endif /* handle RDBLFREE in SFree/SPutSBuf */ - RETVALUE(RDBLFREE); + return (RDBLFREE); } if (CMM_IS_STATIC(ptrHdr->memFlags)) { @@ -3678,7 +3386,7 @@ Size size; #else (Void) SUnlock(&(bkt->bktLock)); #endif - RETVALUE(ROK); + return ROK; } else { @@ -3694,7 +3402,7 @@ Size size; #endif /* handle RTRAMPLINGNOK in SFree/SPutSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } } @@ -3703,31 +3411,10 @@ Size size; bkt->nextBlk = ptrHdr; #else /* MS_REMOVE */ -#if 0 - /* sriky: For debugging double deallocation */ - cmMemset(ptr, 0, 50); -#endif *((CmMmEntry **)ptr) = bkt->next; bkt->next = (CmMmEntry *)ptr; #endif /* SSI_DEBUG_LEVEL1 */ -#if 0 - if(bkt->numAlloc <= 0 || bkt->numAlloc > 12000) - { - void *array[10]; - size_t tmpsize, i; - char **strings; - - printf("\n cmFree: Freed pointer = %x and backtrace:\n", ptr); - printf("****************************************\n"); - tmpsize = backtrace(array, 10); - strings = backtrace_symbols(array, tmpsize); - for(i = 0; i < tmpsize; i++) - printf("%s\n", strings[i]); - printf("****************************************\n"); - free(strings); - } -#endif /* * Decrement the statistics variable of number of memory block * allocated @@ -3770,15 +3457,15 @@ 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); @@ -3789,7 +3476,7 @@ Size size; (Void)free(ptr); #endif avail_size += size; - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -3865,7 +3552,7 @@ Data **ptr; /* error check on parameters */ if ((regCb == NULLP) || (size == NULLP) || !(*size) || (ptr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -3922,7 +3609,7 @@ Data **ptr; /* Update the size parameter */ *size = bkt->size; - RETVALUE(ROK); + return ROK; } } } @@ -3936,11 +3623,11 @@ 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 @@ -3952,9 +3639,9 @@ Data **ptr; *ptr = (Data *)malloc(*size); if ( (*ptr) == NULLP) - RETVALUE(RFAILED); + return RFAILED; /* avail_size -= *size; */ - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ } /* end of cmAllocWL */ @@ -4024,14 +3711,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 @@ -4039,14 +3726,6 @@ Size size; /* * Check if the memory block was allocated from the bucket pool. */ -#if 0 - if(ptr < regCb->regInfo.start) - { - Buffer *tmpbuf = NULLP; - tmpbuf->b_cont = NULLP; - } -#endif - #ifdef MSPD_T2K_TRACK_BUG size += 4; #endif @@ -4062,7 +3741,7 @@ Size size; if (regCb->mapTbl[idx].bktIdx == 0xFF) { /* Some fatal error in the map table initialization. */ - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4099,37 +3778,11 @@ Size size; */ bkt->numAlloc--; -#if 0 - if ((regCb->region == 2) && (bkt->numAlloc < 50)) - { - CmBtInfo *btInfo; - U32 btIdx; - btInfo = &allocBtInfo[regCb->region]; - btIdx = btInfo->btInfoIdx; - btInfo->btInfo[btIdx].ptr = (PTR) *ptr; - { - btInfo->btInfo[btIdx].btSize = backtrace(btInfo->btInfo[btIdx].btArr, NUM_BT_TRACES); - } -#if 0 - gettimeofday(&(btInfo->btInfo[btIdx].timeStamp), NULLP); - cmInsertAllocPtrToList(regCb, (PTR)*ptr); -#endif - - btIdx++; - btIdx &= (NUM_FREE_BUFFERS - 1); - - btInfo->btInfo[btIdx].ptr = (PTR)0; - btInfo->btInfo[btIdx].btSize = 0; - cmMemset(btInfo->btInfo[regCb->mapTbl[idx].bktIdx].btArr, 0, sizeof (btInfo->btInfo[regCb->mapTbl[idx].bktIdx].btArr)); - btInfo->btInfoIdx = btIdx; - } -#endif - - 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*/ @@ -4141,7 +3794,7 @@ Size size; /* avail_size += size; */ free(ptr); - RETVALUE(ROK); + return ROK; #endif /* USE_PURE */ @@ -4196,7 +3849,7 @@ SMemCtl *memCtl; /* error check on parameters */ if ((regCb == NULLP) || (memCtl == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4211,7 +3864,7 @@ SMemCtl *memCtl; if ((memCtl->u.vtop.vaddr == NULLP) || (memCtl->u.vtop.paddr == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif @@ -4221,7 +3874,7 @@ SMemCtl *memCtl; offset = memCtl->u.vtop.vaddr - regCb->regInfo.start; *(memCtl->u.vtop.paddr) = regCb->pAddr + offset; - RETVALUE(ROK); + return ROK; } break; } @@ -4233,7 +3886,7 @@ SMemCtl *memCtl; if (!(memCtl->u.chkres.size) || (memCtl->u.chkres.status == NULLP)) { - RETVALUE(RFAILED); + return RFAILED; } #endif #ifndef USE_PURE @@ -4268,11 +3921,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 */ } @@ -4280,140 +3933,15 @@ SMemCtl *memCtl; default: { /* No other event is supported currently */ - RETVALUE(RFAILED); + return RFAILED; } } /* shouldn't reach here */ - RETVALUE(RFAILED); + return RFAILED; } /* end of cmCtl */ -#if 0 -/* -* -* Fun: cmMmBktInit -* -* Desc: Initialize the bucket and the map table. -* -* -* Ret: ROK - successful, -* RFAILED - unsuccessful. -* -* Notes: This function is called by the cmMmRegInit. -* -* File: cm_mem_wl.c -* -*/ -#ifdef ANSI -PRIVATE Void cmMmBktInit -( -Data **memAddr, -CmMmRegCb *regCb, -CmMmRegCfg *cfg, -U16 bktIdx, -U16 *lstMapIdx -) -#else -PRIVATE Void cmMmBktInit (memAddr, regCb, cfg, bktIdx, lstMapIdx) -Data **memAddr; -CmMmRegCb *regCb; -CmMmRegCfg *cfg; -U16 bktIdx; -U16 *lstMapIdx; -#endif -{ - U32 cnt; - U16 idx; - U32 numBlks; - Size size; - Data **next; - U16 blkSetRelThreshold; - CmMmBktLstCb *bktLstCb; - - TRC2(cmMmBktInit); - - - size = cfg->bktCfg[bktIdx].size; - numBlks = cfg->bktCfg[bktIdx].numBlks; - - regCb->bktTbl[bktIdx].blkSetRelThreshold = cfg->bktCfg[bktIdx].blkSetRelThreshold; - regCb->bktTbl[bktIdx].blkSetAcquireThreshold = cfg->bktCfg[bktIdx].blkSetAcquireThreshold; - blkSetRelThreshold = cfg->bktCfg[bktIdx].blkSetRelThreshold; - - /* Initialize the bucket linked list */ - cmLListInit(®Cb->bktTbl[bktIdx].listBktSet); - - /* Reset the next pointer */ - regCb->bktTbl[bktIdx].next = NULLP; - - /* Initialize the link list of the memory block */ - next = &(regCb->bktTbl[bktIdx].next); - for (cnt = 0; cnt < numBlks; cnt++) - { - *next = *memAddr; - next = (CmMmEntry **)(*memAddr); - *memAddr = (*memAddr) + size; - - /* Maintain the list Cb */ - if((cnt != 0) && (!(cnt % blkSetRelThreshold))) - { - bktLstCb = calloc(1, sizeof(CmMmBktLstCb)); - bktLstCb->nextBktPtr = regCb->bktTbl[bktIdx].next; - bktLstCb->numBkt = blkSetRelThreshold; - cmLListAdd2Tail((®Cb->bktTbl[bktIdx].listBktSet), (&bktLstCb->memSetNode)); - next = &(regCb->bktTbl[bktIdx].next); - regCb->numBkts++; - } - } - *next = NULLP; - - bktLstCb = cmLListFirst((®Cb->bktTbl[bktIdx].listBktSet)); - regCb->bktTbl[bktIdx].next = bktLstCb->nextBktPtr; - cmLListDelFrm((®Cb->bktTbl[bktIdx].listBktSet), bktLstCb); - free(bktLstCb); - - /* Initialize the Map entry */ - idx = size / cfg->bktQnSize; - - /* - * Check if the size is multiple of quantum size. If not we need to initialize - * one more map table entry. - */ - if(size % cfg->bktQnSize) - { - idx++; - } - - while ( *lstMapIdx < idx) - { - regCb->mapTbl[*lstMapIdx].bktIdx = bktIdx; - -#if (ERRCLASS & ERRCLS_DEBUG) - regCb->mapTbl[*lstMapIdx].numReq = 0; - regCb->mapTbl[*lstMapIdx].numFailure = 0; -#endif - - (*lstMapIdx)++; - } - - /* Initialize the bucket structure */ - regCb->bktTbl[bktIdx].size = size; - regCb->bktTbl[bktIdx].numBlks = numBlks; - regCb->bktTbl[bktIdx].numAlloc = 0; - regCb->bktTbl[bktIdx].maxAlloc = 0; - - /* Update the total bucket size */ - regCb->bktSize += (size * numBlks); - - regCb->bktTbl[bktIdx].bktFailCnt = 0; - regCb->bktTbl[bktIdx].bktNoFitCnt = 0; - - RETVOID; -} /* end of cmMmBktInit */ -#endif - - /* * * Fun: cmMmHeapInit @@ -4650,7 +4178,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } @@ -4744,7 +4272,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -4756,7 +4284,7 @@ Size *size; #else (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } } } @@ -4827,7 +4355,7 @@ Size *size; #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -4845,7 +4373,7 @@ Size *size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROUTRES); + return (ROUTRES); } /* end of cmHeapAlloc */ @@ -4992,7 +4520,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif /* handle RTRAMPLINGNOK in SAlloc/SGetSBuf */ - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } else { @@ -5006,7 +4534,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(ROK); + return ROK; } } @@ -5031,7 +4559,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RDBLFREE); + return (RDBLFREE); } #endif /* SSI_DEBUG_LEVEL1 */ @@ -5089,7 +4617,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)) @@ -5150,7 +4678,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } else if (p < curHBlk) @@ -5221,7 +4749,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } } @@ -5270,7 +4798,7 @@ Size size; } }/* End of if */ #endif /* SS_HISTOGRAM_SUPPORT */ - RETVALUE(ROK); + return ROK; } /* Release the lock */ @@ -5281,7 +4809,7 @@ Size size; (Void) SUnlock (&(heapCb->heapLock)); #endif - RETVALUE(RFAILED); + return RFAILED; } /* end of cmHeapFree */ /* cm_mem_c_001.main_15 : Additions */ #endif @@ -5728,7 +5256,7 @@ S32 traceSize; funNm); if(memReqIdx >= 0) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } @@ -5739,13 +5267,13 @@ S32 traceSize; (const S8 *)memUsrMdlStr[mdlFunStrIdx].fPStr); if(retVal == NULLD) { - RETVALUE(mdlFunStrIdx); + return (mdlFunStrIdx); } mdlFunStrIdx++; } } - RETVALUE(0); + return (0); } /* cmMemGetModuleId */ /* @@ -5816,9 +5344,9 @@ S8 **strLst; if(!found) { - RETVALUE(-1); + return (-1); } - RETVALUE(strtIdx); + return (strtIdx); } /* cmMemGetStrMtchIdx */ @@ -5999,20 +5527,20 @@ S32 size; 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)); } @@ -6053,7 +5581,7 @@ Void *arg; 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); @@ -6065,7 +5593,7 @@ Void *arg; (void) cmAddrToSymStr((void *)pc, buffer, 505); bt->bt_buffer[bt->bt_actcount++] = (S8 *)buffer; - RETVALUE(0); + return (0); } /* cmLeakCallBack */ /* @@ -6105,9 +5633,9 @@ S32 count; bt.bt_actcount = 0; if (getcontext(&u) < 0) - RETVALUE(0); + return (0); (Void) walkcontext(&u, cmLeakCallBack, &bt); - RETVALUE(bt.bt_actcount); + return (bt.bt_actcount); } /* backtrace */ @@ -6166,7 +5694,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 */ @@ -6179,7 +5707,7 @@ CmMmBkt *bkt; SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -6219,10 +5747,10 @@ CmMmHeapCb *heapCb; if (heapCb->trampleCount > CMM_TRAMPLING_THRESHOLD) { - RETVALUE(RTRAMPLINGNOK); + return (RTRAMPLINGNOK); } - RETVALUE(RTRAMPLINGOK); + return (RTRAMPLINGOK); } /* @@ -6257,11 +5785,11 @@ CmMmBlkHdr *blkPtr; { if (blkPtr->trSignature[sigCnt] != 0xAB) { - RETVALUE(RFAILED); + return RFAILED; } } - RETVALUE(ROK); + return ROK; } /* @@ -6298,7 +5826,7 @@ U16 *idx; /* idx to return */ *idx = (U16)(key % hashListCp->numOfbins); - RETVALUE(ROK); + return ROK; } /* end of cmMmHashFunc () */ @@ -6354,7 +5882,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; @@ -6367,7 +5895,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = nmbBins; } - RETVALUE(ROK); + return ROK; } /* @@ -6416,7 +5944,7 @@ Pool pool; /* memory pool to allocate bins */ hashListCp->numOfbins = 0; hashListCp->numOfEntries = 0; - RETVALUE(ROK); + return ROK; } /* end of cmMmHashListDeinit */ /* @@ -6456,11 +5984,11 @@ U32 key; /* pointer to key */ /* 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; @@ -6496,11 +6024,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 */ @@ -6544,7 +6072,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6585,7 +6113,7 @@ CmHstGrmHashListCp *hashListCp; /* hash list to initialize */ SDisplay(0, dbgPrntBuf); #endif /* DEBUGP */ memset(hashListCp, 0, sizeof(CmHstGrmHashListCp)); - RETVALUE(ROK); + return ROK; } /* @@ -6644,14 +6172,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 */ @@ -6669,7 +6197,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 */ @@ -6730,13 +6258,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 */ @@ -6757,7 +6285,7 @@ U8 entId; /* Increase the total number of entries in the hash list */ hashListCp->totalNumEntries++; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmAllocInsert */ @@ -6805,7 +6333,7 @@ U32 *key; }/* End of for */ *key += line; *binIdx = ( *key % CMM_HIST_MAX_MEM_BIN); - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6857,7 +6385,7 @@ U8 entId; entry->fileName[idx] = fileName[idx]; } entry->fileName[idx] = '\0'; - RETVALUE(ROK); + return ROK; } /* end of cmHstGrmFillEntry */ /* @@ -6912,7 +6440,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) */ @@ -6935,12 +6463,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 */ @@ -6948,29 +6476,6 @@ CmMemEntries **entry; T2kMeamLeakInfo gMemLeakInfo[T2K_MEM_LEAK_INFO_TABLE_SIZE]; U32 getT2kMemLeakIndex(U32 address) { -#if 0 - /* - 1 2 3 4 5 6 7 - - XOR 7 with 3 and remove 7 - XOR 1 with 5 and remove 1 - */ - - address -= T2K_MEM_LEAK_START_ADDR; - - U8 Nib7 = address & 0x0000000f; - U8 Nib1 = (address & 0x0f000000) >>24; - U8 Nib3 = (address & 0x000f0000) >> 16; - U8 Nib5 = (address & 0x00000f00) >> 8; - - /* store 8 ^ 3 in 8Nib */ - Nib7 = Nib7 ^ Nib3; - /* store 1 ^ 6 in 6Nib */ - Nib5 = Nib5 ^ Nib1; - - return(((address & 0x000fff00) | (Nib7 << 20) | (Nib5 << 4)) >> 4); - -#endif return ((address - T2K_MEM_LEAK_START_ADDR) >> 8); } @@ -7012,32 +6517,6 @@ void InsertToT2kMemLeakInfo(U32 address, U32 size, U32 lineNo, char* fileName) gMemLeakInfo[idx].address, gMemLeakInfo[idx].fileName, gMemLeakInfo[idx].lineNo, gMemLeakInfo[idx].size, gMemLeakInfo[idx].age, (t2kMemAllocTick-gMemLeakInfo[idx].age)); -#if 0 - /* Try inserting into some other location */ - int i; - int lastIndex = idx + 1; - Bool inserted = FALSE; - for(i = 2; lastIndex < T2K_MEM_LEAK_INFO_TABLE_SIZE && i < 30; i++) - { - if(gMemLeakInfo[lastIndex].address == 0) - { - gMemLeakInfo[lastIndex].address = address; - gMemLeakInfo[lastIndex].size = size; - gMemLeakInfo[lastIndex].lineNo = lineNo; - gMemLeakInfo[lastIndex].fileName = fileName; - gMemLeakInfo[lastIndex].age = (++t2kMemAllocTick) >> 14; /*For every 16384 memory block allocations,Alloc Tick is incremented by 1*/ - inserted = TRUE; - break; - } - lastIndex = idx + (i * i * i); - } -#if 1 - if(!inserted) - { - printf("Something is wrong, trying to insert %x idx = %d no free i = %d\n",address, idx, i); - } -#endif -#endif } } @@ -7080,32 +6559,6 @@ void RemoveFromT2kMemLeakInfo(U32 address, char *file, U32 line) printf("Previous File:%s, Previous Line:%ld\n", gMemLeakInfo[idx].prevRemFileName, gMemLeakInfo[idx].prevRemLineNo); } -#if 0 - /* Try removing from some other location where it might have been stored*/ - int i; - int lastIndex = idx + 1; - Bool removed = FALSE; - for(i = 2; lastIndex < T2K_MEM_LEAK_INFO_TABLE_SIZE && i < 30; i++) - { - if(gMemLeakInfo[lastIndex].address == address) - { - gMemLeakInfo[lastIndex].address = 0; - gMemLeakInfo[lastIndex].size = 0; - gMemLeakInfo[lastIndex].lineNo = 0; - gMemLeakInfo[lastIndex].fileName = 0; - gMemLeakInfo[lastIndex].age = 0; /*For every 16384 memory block allocations,Alloc Tick is incremented by 1*/ - removed = TRUE; - break; - } - lastIndex = idx + (i*i*i); - } -#if 1 - if(!removed) - { - printf("Something is wrong, trying to remove %x idx = %d lastIndex = %d FreeCalled from File=%s, line=%d\n",address, idx, lastIndex,file,line); - } -#endif -#endif } } @@ -7215,7 +6668,7 @@ CmLteMemInfo *mInfo; } } - RETVALUE(ROK); + return ROK; } /* @@ -7255,10 +6708,10 @@ Region region; ((poolOneFreeCnt * 100) > (ICC_MEM_LOWER_THRESHOLD * ICC_POOL_ONE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } @@ -7305,10 +6758,10 @@ Region region; ((poolThreeFreeCnt * 100) > (ICC_MEM_LOWER_THRESHOLD * ICC_POOL_THREE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /* @@ -7354,10 +6807,10 @@ Region region; ((poolThreeFreeCnt * 100) < (ICC_MEM_UPPER_THRESHOLD * ICC_POOL_THREE_TOTAL_BLKS))) { - RETVALUE(TRUE); + return (TRUE); } - RETVALUE(FALSE); + return (FALSE); } /* ccpu00142274- Function to check if we have reached the @@ -7403,7 +6856,7 @@ Region reg; if(gMemoryAlarm) { gMemoryAlarm = !(isMemUsageBelowLowerThreshold(reg)); - RETVALUE(RFAILED); + return RFAILED; } else { @@ -7413,200 +6866,10 @@ Region reg; memoryCheckCounter = 0; } } - RETVALUE(ROK); + return ROK; } #endif #endif /* SS_LOCKLESS_MEMORY */ -#if 0 -T2kMeamLeakInfo gMemLeakInfo[T2K_MEM_LEAK_INFO_TABLE_SIZE]; -U32 getT2kMemLeakIndex(U32 address) -{ -#if 0 - /* - 1 2 3 4 5 6 7 - - XOR 7 with 3 and remove 7 - XOR 1 with 5 and remove 1 - */ - - address -= T2K_MEM_LEAK_START_ADDR; - - U8 Nib7 = address & 0x0000000f; - U8 Nib1 = (address & 0x0f000000) >>24; - U8 Nib3 = (address & 0x000f0000) >> 16; - U8 Nib5 = (address & 0x00000f00) >> 8; - - /* store 8 ^ 3 in 8Nib */ - Nib7 = Nib7 ^ Nib3; - /* store 1 ^ 6 in 6Nib */ - Nib5 = Nib5 ^ Nib1; - - return(((address & 0x000fff00) | (Nib7 << 20) | (Nib5 << 4)) >> 4); - -#endif - return ((address - T2K_MEM_LEAK_START_ADDR) >> 8); -} - -static U32 t2kMemAllocTick; -static U32 smallTick; - -void InsertToT2kMemLeakInfo(U32 address, U32 size, U32 lineNo, char* fileName) -{ - U32 index = getT2kMemLeakIndex(address); - - if(((U32)(address - T2K_MEM_LEAK_START_ADDR) & 0xff) !=0) - { - printf("address in InsertToT2kMemLeakInfo is %x size = %d file is %s line is %d \n", address, size, fileName, lineNo); - } - - if(gMemLeakInfo[index].address == 0) - { - gMemLeakInfo[index].address = address; - gMemLeakInfo[index].size = size; - gMemLeakInfo[index].lineNo = lineNo; - gMemLeakInfo[index].fileName = fileName; - gMemLeakInfo[index].age = t2kMemAllocTick; - gMemLeakInfo[index].prevRemLineNo = 0; - gMemLeakInfo[index].prevRemFileName = '\0'; - - if(smallTick++ == 4096) - { - smallTick = 0; - gMemLeakInfo[index].age = (++t2kMemAllocTick); - } - } - else - { - printf("Something is wrong, trying to insert %x index = %d file is %s line is %d \n",address, index, fileName, lineNo); - printf("Address present :%x, from File:%s, Line:%d, Size:%d, Age:%d", - gMemLeakInfo[index].address, gMemLeakInfo[index].fileName, - gMemLeakInfo[index].lineNo, gMemLeakInfo[index].size, - gMemLeakInfo[index].age); -#if 0 - /* Try inserting into some other location */ - int i; - int lastIndex = index + 1; - Bool inserted = FALSE; - for(i = 2; lastIndex < T2K_MEM_LEAK_INFO_TABLE_SIZE && i < 30; i++) - { - if(gMemLeakInfo[lastIndex].address == 0) - { - gMemLeakInfo[lastIndex].address = address; - gMemLeakInfo[lastIndex].size = size; - gMemLeakInfo[lastIndex].lineNo = lineNo; - gMemLeakInfo[lastIndex].fileName = fileName; - gMemLeakInfo[lastIndex].age = (++t2kMemAllocTick) >> 14; /*For every 16384 memory block allocations,Alloc Tick is incremented by 1*/ - inserted = TRUE; - break; - } - lastIndex = index + (i * i * i); - } -#if 1 - if(!inserted) - { - printf("Something is wrong, trying to insert %x index = %d no free i = %d\n",address, index, i); - } -#endif -#endif - } -} - - -void RemoveFromT2kMemLeakInfo(U32 address, char *file, U32 line) -{ - U32 index = getT2kMemLeakIndex(address); - - if(index >= T2K_MEM_LEAK_INFO_TABLE_SIZE) - { - printf("Index out of range = %d address is %x file = %s line = %d. We are going to crash!!!\n", - index, - address, - file, - line); - } - if(gMemLeakInfo[index].address == address) - { - gMemLeakInfo[index].address = 0; - gMemLeakInfo[index].age = 0; - gMemLeakInfo[index].prevRemLineNo = gMemLeakInfo[index].lineNo; - gMemLeakInfo[index].prevRemFileName = gMemLeakInfo[index].fileName; - - /*printf("Something is wrong, Trying to double free Address = %x, Index = %d \n",address,index);*/ - } - else - { - printf("Something is wrong, trying to remove %x index = %d from File=%s, line=%d address present is %x\n",address, index, file,line, - gMemLeakInfo[index].address); - if(gMemLeakInfo[index].prevRemFileName != NULLP) - { - printf("Previous File:%s, Previous Line:%d\n", - gMemLeakInfo[index].prevRemFileName, gMemLeakInfo[index].prevRemLineNo); - } -#if 0 - /* Try removing from some other location where it might have been stored*/ - int i; - int lastIndex = index + 1; - Bool removed = FALSE; - for(i = 2; lastIndex < T2K_MEM_LEAK_INFO_TABLE_SIZE && i < 30; i++) - { - if(gMemLeakInfo[lastIndex].address == address) - { - gMemLeakInfo[lastIndex].address = 0; - gMemLeakInfo[lastIndex].size = 0; - gMemLeakInfo[lastIndex].lineNo = 0; - gMemLeakInfo[lastIndex].fileName = 0; - gMemLeakInfo[lastIndex].age = 0; /*For every 16384 memory block allocations,Alloc Tick is incremented by 1*/ - removed = TRUE; - break; - } - lastIndex = index + (i*i*i); - } -#if 1 - if(!removed) - { - printf("Something is wrong, trying to remove %x index = %d lastIndex = %d FreeCalled from File=%s, line=%d\n",address, index, lastIndex,file,line); - } -#endif -#endif - } -} - -void DumpT2kMemLeakInfoToFile() -{ - int i; - - FILE *fp = fopen("memLeakInfo.txt","wb"); - - if(fp == NULL) - { - printf("Could not open file for dumping mem leak info\n"); - return; - } - - for(i = 0; i< T2K_MEM_LEAK_INFO_TABLE_SIZE; i++) - { - if(gMemLeakInfo[i].address != 0) - { - char* onlyFileName = rindex(gMemLeakInfo[i].fileName,'/'); - if(onlyFileName == NULL) - { - onlyFileName = gMemLeakInfo[i].fileName; - } - - fprintf(fp, "%p s=%d a=%d l=%d f=%s\n",gMemLeakInfo[i].address, - gMemLeakInfo[i].size, - gMemLeakInfo[i].age, - gMemLeakInfo[i].lineNo, - onlyFileName); - } - } - - fprintf(fp,"Current t2kMemAllocTick = %d\n",t2kMemAllocTick); - - fclose(fp); -} -#endif - /********************************************************************** End of file **********************************************************************/