don't print PRVM_NAME in each dprint call, it looks terrible (prints multiple times...

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index bde6fdf137f37c43b393fc0ff3e0edfb190216ae..d8c54d0aa4b7730eff9385b9399eb84a38de25c8 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -205,7 +205,7 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 #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));
@@ -216,6 +216,7 @@ mempool_t *_Mem_AllocPool(const char *name, mempool_t *parent, const char *filen
        pool->sentinel2 = MEMHEADER_SENTINEL1;
        pool->filename = filename;
        pool->fileline = fileline;
+       pool->flags = flags;
        pool->chain = NULL;
        pool->totalsize = 0;
        pool->realsize = sizeof(mempool_t);
@@ -229,7 +230,7 @@ mempool_t *_Mem_AllocPool(const char *name, mempool_t *parent, const char *filen
 void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
 {
        mempool_t **chainaddress, *iter, *temp;
-       
+
        if (*pool)
        {
                if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
@@ -244,13 +245,13 @@ void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
 
                // 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);
@@ -261,7 +262,7 @@ void _Mem_FreePool(mempool_t **pool, const 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)
@@ -271,7 +272,7 @@ void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline)
 
        // 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)
@@ -329,6 +330,19 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline)
 #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
@@ -348,14 +362,14 @@ void Mem_PrintStats(void)
                size += pool->totalsize;
        }
        Con_Printf("%i memory pools, totalling %i bytes (%.3fMB)\n", count, size, size / 1048576.0);
-       if (tempmempool == NULL)
-               Con_Print("Error: no tempmempool allocated\n");
-       else if (tempmempool->chain)
+       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_Print("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 %i bytes (%.3fMB)!  Listing contents...\n", pool, pool->totalsize, pool->totalsize / 1048576.0);
+                       for (mem = pool->chain;mem;mem = mem->next)
+                               Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline);
+               }
        }
 }
 
@@ -368,10 +382,7 @@ void Mem_PrintList(int listallocations)
                   "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("%10ik (%10ik actual) %s (%+i byte change) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name, pool->totalsize - pool->lastchecksize, (pool->flags & POOLFLAG_TEMP) ? "TEMP" : "");
                pool->lastchecksize = pool->totalsize;
                if (listallocations)
                        for (mem = pool->chain;mem;mem = mem->next)
@@ -401,11 +412,11 @@ void MemList_f(void)
        }
 }
 
-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();
 }
 
@@ -417,11 +428,17 @@ Memory_Init
 */
 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);