olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] qbsp: Account size of winding_t allocations 

Memory stats are reported inaccurately because the memory allocated to
windings is not accounted correctly (when freed, in particular). Use the usual
technique of recording the allocated size in the same block of memory, just
before the portion returned to the caller.

Signed-off-by: Tyrann <tyrann@disenchant.net>
This commit is contained in:
Tyrann 2006-10-01 20:21:44 +09:30
parent 47c83e7db7
commit c5b7fa7d2b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qbsp/util.c
View File

@ -57,7 +57,7 @@ AllocMem(int Type, int cElements, bool fZero)
if (cElements > MAX_POINTS_ON_WINDING)
Message(msgError, errTooManyPoints, cElements);
cSize = (int)((winding_t *)0)->points[cElements];
cSize = (int)((winding_t *)0)->points[cElements] + sizeof(int);
// Set cElements to 1 so bookkeeping works OK
cElements = 1;
@ -89,6 +89,10 @@ AllocMem(int Type, int cElements, bool fZero)
// Special stuff for face_t
if (Type == FACE)
((face_t *)pTemp)->planenum = -1;
if (Type == WINDING) {
*(int *)pTemp = cSize;
pTemp = (char *)pTemp + sizeof(int);
}
rgMemTotal[Type] += cElements;
rgMemActive[Type] += cElements;
@ -114,7 +118,11 @@ void
FreeMem(void *pMem, int Type, int cElements)
{
rgMemActive[Type] -= cElements;
rgMemActive[GLOBAL] -= cElements * rgcMemSize[Type];
if (Type == WINDING) {
pMem = (char *)pMem - sizeof(int);
rgMemActive[GLOBAL] -= *(int *)pMem;
} else
rgMemActive[GLOBAL] -= cElements * rgcMemSize[Type];
free(pMem);
}