mempool_t *poolchain = NULL;
-void *_Mem_Alloc(mempool_t *pool, int size, const char *filename, int fileline)
+void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int fileline)
{
#if MEMCLUMPING
int i, j, k, needed, endbit, largest;
{
#endif
pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
- memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
+ if (developer.integer)
+ memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
free(mem);
#if MEMCLUMPING
}
#endif
}
-mempool_t *_Mem_AllocPool(const char *name, mempool_t *parent, const char *filename, int fileline)
+mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const char *filename, int fileline)
{
mempool_t *pool;
pool = malloc(sizeof(mempool_t));
pool->sentinel2 = MEMHEADER_SENTINEL1;
pool->filename = filename;
pool->fileline = fileline;
+ pool->flags = flags;
pool->chain = NULL;
pool->totalsize = 0;
pool->realsize = sizeof(mempool_t);
void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
{
mempool_t **chainaddress, *iter, *temp;
-
+
if (*pool)
{
if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
// free memory owned by the pool
while ((*pool)->chain)
- Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)));
+ _Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)), filename, fileline);
// 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)));
+ _Mem_Free((void *)((qbyte *) pool->chain + sizeof(memheader_t)), filename, fileline);
// empty child pools, too
for(chainaddress = poolchain; chainaddress; chainaddress = chainaddress->next)
#endif
}
+qboolean Mem_IsAllocated(mempool_t *pool, void *data)
+{
+ memheader_t *header;
+ memheader_t *target;
+
+ target = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+ for( header = pool->chain ; header ; header = header->next )
+ if( header == target )
+ return true;
+ return false;
+}
+
+
// used for temporary memory allocations around the engine, not for longterm
// storage, if anything in this pool stays allocated during gameplay, it is
// considered a leak
void Mem_PrintStats(void)
{
- int count = 0, size = 0;
+ size_t count = 0, size = 0;
mempool_t *pool;
memheader_t *mem;
Mem_CheckSentinelsGlobal();
count++;
size += pool->totalsize;
}
- Con_Printf("%i memory pools, totalling %i bytes (%.3fMB)\n", count, size, size / 1048576.0);
- if (tempmempool == NULL)
- Con_Printf("Error: no tempmempool allocated\n");
- else if (tempmempool->chain)
+ Con_Printf("%lu memory pools, totalling %lu bytes (%.3fMB)\n", (unsigned long)count, (unsigned long)size, size / 1048576.0);
+ for (pool = poolchain;pool;pool = pool->next)
{
- Con_Printf("%i bytes (%.3fMB) of temporary memory still allocated (Leak!)\n", tempmempool->totalsize, tempmempool->totalsize / 1048576.0);
- Con_Printf("listing temporary memory allocations:\n");
- for (mem = tempmempool->chain;mem;mem = mem->next)
- Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline);
+ if ((pool->flags & POOLFLAG_TEMP) && pool->chain)
+ {
+ Con_Printf("Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)! Listing contents...\n", pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0);
+ for (mem = pool->chain;mem;mem = mem->next)
+ Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline);
+ }
}
}
mempool_t *pool;
memheader_t *mem;
Mem_CheckSentinelsGlobal();
- Con_Printf("memory pool list:\n"
+ Con_Print("memory pool list:\n"
"size name\n");
for (pool = poolchain;pool;pool = pool->next)
{
- if (pool->lastchecksize != 0 && 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("%10ik (%10ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name);
+ Con_Printf("%10luk (%10luk actual) %s (%+li byte change) %s\n", (unsigned long) ((pool->totalsize + 1023) / 1024), (unsigned long)((pool->realsize + 1023) / 1024), pool->name, (long)pool->totalsize - pool->lastchecksize, (pool->flags & POOLFLAG_TEMP) ? "TEMP" : "");
pool->lastchecksize = pool->totalsize;
if (listallocations)
for (mem = pool->chain;mem;mem = mem->next)
- Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline);
+ Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline);
}
}
}
// drop through
default:
- Con_Printf("MemList_f: unrecognized options\nusage: memlist [all]\n");
+ Con_Print("MemList_f: unrecognized options\nusage: memlist [all]\n");
break;
}
}
-extern void R_TextureStats_PrintTotal(void);
+extern void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean printtotal);
void MemStats_f(void)
{
Mem_CheckSentinelsGlobal();
- R_TextureStats_PrintTotal();
+ R_TextureStats_Print(false, false, true);
Mem_PrintStats();
}
*/
void Memory_Init (void)
{
- tempmempool = Mem_AllocPool("Temporary Memory");
- zonemempool = Mem_AllocPool("Zone");
+ tempmempool = Mem_AllocPool("Temporary Memory", POOLFLAG_TEMP, NULL);
+ zonemempool = Mem_AllocPool("Zone", 0, NULL);
poolchain = NULL;
}
+void Memory_Shutdown (void)
+{
+// Mem_FreePool (&zonemempool);
+// Mem_FreePool (&tempmempool);
+}
+
void Memory_Init_Commands (void)
{
Cmd_AddCommand ("memstats", MemStats_f);