#include "quakedef.h"
cvar_t developer_memory = {0, "developer_memory", "0"};
+cvar_t developer_memorydebug = {0, "developer_memorydebug", "0"};
mempool_t *poolchain = NULL;
Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
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)
#endif
}
-mempool_t *_Mem_AllocPool(const char *name, const 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));
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, const char *filename, int fileline)
{
- mempool_t **chainaddress;
+ mempool_t **chainaddress, *iter, *temp;
+
if (*pool)
{
if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
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);
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)
// 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, const char *filename, int fileline)
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)
{
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);
}