X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=da47317837585bac23fce699934c5aed92785cb0;hb=8abf1b158a01589db8bc74a7d1ecd501ae3845a0;hp=b0decee99a922db24a6e2f1ebf50a972d5adef47;hpb=99dc7490c17b02fd914d2a0c021753a42acde35d;p=xonotic%2Fdarkplaces.git diff --git a/zone.c b/zone.c index b0decee9..da473178 100644 --- a/zone.c +++ b/zone.c @@ -21,9 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +cvar_t developer_memory = {0, "developer_memory", "0"}; +cvar_t developer_memorydebug = {0, "developer_memorydebug", "0"}; + mempool_t *poolchain = NULL; -void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline) +void *_Mem_Alloc(mempool_t *pool, int size, const char *filename, int fileline) { #if MEMCLUMPING int i, j, k, needed, endbit, largest; @@ -34,7 +37,10 @@ void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline) return NULL; if (pool == NULL) Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline); - Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, size); + if (developer.integer && developer_memory.integer) + Con_Printf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, size); + if (developer.integer && developer_memorydebug.integer) + _Mem_CheckSentinelsGlobal(filename, fileline); pool->totalsize += size; #if MEMCLUMPING if (size < 4096) @@ -119,7 +125,7 @@ choseclump: return (void *)((qbyte *) mem + sizeof(memheader_t)); } -void _Mem_Free(void *data, char *filename, int fileline) +void _Mem_Free(void *data, const char *filename, int fileline) { #if MEMCLUMPING int i, firstblock, endblock; @@ -136,7 +142,8 @@ void _Mem_Free(void *data, char *filename, int fileline) if (*((qbyte *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2) Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); pool = mem->pool; - Con_DPrintf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size); + if (developer.integer && developer_memory.integer) + Con_Printf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size); // unlink memheader from doubly linked list if ((mem->prev ? mem->prev->next != mem : pool->chain != mem) || (mem->next && mem->next->prev != mem)) Sys_Error("Mem_Free: not allocated or double freed (free at %s:%i)", filename, fileline); @@ -197,7 +204,7 @@ void _Mem_Free(void *data, char *filename, int fileline) #endif } -mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline) +mempool_t *_Mem_AllocPool(const char *name, mempool_t *parent, const char *filename, int fileline) { mempool_t *pool; pool = malloc(sizeof(mempool_t)); @@ -211,15 +218,17 @@ mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline) pool->chain = NULL; pool->totalsize = 0; pool->realsize = sizeof(mempool_t); - strcpy(pool->name, name); + strlcpy (pool->name, name, sizeof (pool->name)); + pool->parent = parent; pool->next = poolchain; poolchain = pool; return pool; } -void _Mem_FreePool(mempool_t **pool, char *filename, int fileline) +void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline) { - mempool_t **chainaddress; + mempool_t **chainaddress, *iter, *temp; + if (*pool) { if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1) @@ -236,6 +245,11 @@ void _Mem_FreePool(mempool_t **pool, char *filename, int fileline) while ((*pool)->chain) Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t))); + // free child pools, too + for(iter = poolchain; iter; temp = iter = iter->next) + if(iter->parent == *pool) + _Mem_FreePool(&temp, filename, fileline); + // free the pool itself memset(*pool, 0xBF, sizeof(mempool_t)); free(*pool); @@ -243,8 +257,10 @@ void _Mem_FreePool(mempool_t **pool, char *filename, int fileline) } } -void _Mem_EmptyPool(mempool_t *pool, char *filename, int fileline) +void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline) { + mempool_t *chainaddress; + if (pool == NULL) Sys_Error("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline); if (pool->sentinel1 != MEMHEADER_SENTINEL1) @@ -255,9 +271,15 @@ void _Mem_EmptyPool(mempool_t *pool, char *filename, int fileline) // free memory owned by the pool while (pool->chain) Mem_Free((void *)((qbyte *) pool->chain + sizeof(memheader_t))); + + // empty child pools, too + for(chainaddress = poolchain; chainaddress; chainaddress = chainaddress->next) + if(chainaddress->parent == pool) + _Mem_EmptyPool(chainaddress, filename, fileline); + } -void _Mem_CheckSentinels(void *data, char *filename, int fileline) +void _Mem_CheckSentinels(void *data, const char *filename, int fileline) { memheader_t *mem; @@ -272,7 +294,7 @@ void _Mem_CheckSentinels(void *data, char *filename, int fileline) } #if MEMCLUMPING -static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int fileline) +static void _Mem_CheckClumpSentinels(memclump_t *clump, const char *filename, int fileline) { // this isn't really very useful if (clump->sentinel1 != MEMCLUMP_SENTINEL) @@ -282,7 +304,7 @@ static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int file } #endif -void _Mem_CheckSentinelsGlobal(char *filename, int fileline) +void _Mem_CheckSentinelsGlobal(const char *filename, int fileline) { memheader_t *mem; #if MEMCLUMPING @@ -346,9 +368,9 @@ void Mem_PrintList(int listallocations) for (pool = poolchain;pool;pool = pool->next) { if (pool->lastchecksize != 0 && pool->totalsize != pool->lastchecksize) - Con_Printf("%6ik (%6ik actual) %s (%i byte change)\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name, pool->totalsize - pool->lastchecksize); + Con_Printf("%10ik (%10ik actual) %s (%i byte change)\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name, pool->totalsize - pool->lastchecksize); else - Con_Printf("%6ik (%6ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name); + Con_Printf("%10ik (%10ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name); pool->lastchecksize = pool->totalsize; if (listallocations) for (mem = pool->chain;mem;mem = mem->next) @@ -396,11 +418,14 @@ void Memory_Init (void) { tempmempool = Mem_AllocPool("Temporary Memory"); zonemempool = Mem_AllocPool("Zone"); + poolchain = NULL; } void Memory_Init_Commands (void) { Cmd_AddCommand ("memstats", MemStats_f); Cmd_AddCommand ("memlist", MemList_f); + Cvar_RegisterVariable (&developer_memory); + Cvar_RegisterVariable (&developer_memorydebug); }