Removed an unused variable

[xonotic/darkplaces.git] / zone.c

diff --git a/zone.c b/zone.c
index 309658339089c025b16db7d6d470b59b6608f98a..0f1678d8dcc0c53ca4e14a4451d254fc09ed306c 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -135,6 +135,12 @@ void _Mem_Free(void *data, const char *filename, int fileline)
        mempool_t *pool;
        if (data == NULL)
                Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
+       if (developer.integer && developer_memorydebug.integer)
+       {
+               _Mem_CheckSentinelsGlobal(filename, fileline);
+               if (!Mem_IsAllocated(NULL, data))
+                       Sys_Error("Mem_Free: data is not allocated (called at %s:%i)", filename, fileline);
+       }
 
        mem = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
        if (mem->sentinel1 != MEMHEADER_SENTINEL1)
@@ -208,6 +214,8 @@ void _Mem_Free(void *data, 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;
+       if (developer.integer && developer_memorydebug.integer)
+               _Mem_CheckSentinelsGlobal(filename, fileline);
        pool = malloc(sizeof(mempool_t));
        if (pool == NULL)
                Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
@@ -231,16 +239,18 @@ void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
 {
        mempool_t **chainaddress, *iter, *temp;
 
+       if (developer.integer && developer_memorydebug.integer)
+               _Mem_CheckSentinelsGlobal(filename, fileline);
        if (*pool)
        {
-               if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
-                       Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
-               if ((*pool)->sentinel2 != MEMHEADER_SENTINEL1)
-                       Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
                // unlink pool from chain
                for (chainaddress = &poolchain;*chainaddress && *chainaddress != *pool;chainaddress = &((*chainaddress)->next));
                if (*chainaddress != *pool)
                        Sys_Error("Mem_FreePool: pool already free (freepool at %s:%i)", filename, fileline);
+               if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
+                       Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
+               if ((*pool)->sentinel2 != MEMHEADER_SENTINEL1)
+                       Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
                *chainaddress = (*pool)->next;
 
                // free memory owned by the pool
@@ -263,6 +273,16 @@ void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline)
 {
        mempool_t *chainaddress;
 
+       if (developer.integer && developer_memorydebug.integer)
+       {
+               _Mem_CheckSentinelsGlobal(filename, fileline);
+               // check if this pool is in the poolchain
+               for (chainaddress = poolchain;chainaddress;chainaddress = chainaddress->next)
+                       if (chainaddress == pool)
+                               break;
+               if (!chainaddress)
+                       Sys_Error("Mem_EmptyPool: pool is already free (emptypool at %s:%i)", filename, fileline);
+       }
        if (pool == NULL)
                Sys_Error("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline);
        if (pool->sentinel1 != MEMHEADER_SENTINEL1)
@@ -335,10 +355,21 @@ 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;
+       if (pool)
+       {
+               // search only one pool
+               target = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+               for( header = pool->chain ; header ; header = header->next )
+                       if( header == target )
+                               return true;
+       }
+       else
+       {
+               // search all pools
+               for (pool = poolchain;pool;pool = pool->next)
+                       if (Mem_IsAllocated(pool, data))
+                               return true;
+       }
        return false;
 }
 
@@ -352,7 +383,7 @@ mempool_t *zonemempool;
 
 void Mem_PrintStats(void)
 {
-       int count = 0, size = 0;
+       size_t count = 0, size = 0;
        mempool_t *pool;
        memheader_t *mem;
        Mem_CheckSentinelsGlobal();
@@ -361,14 +392,14 @@ void Mem_PrintStats(void)
                count++;
                size += pool->totalsize;
        }
-       Con_Printf("%i memory pools, totalling %i bytes (%.3fMB)\n", count, size, size / 1048576.0);
+       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)
        {
                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);
+                       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("%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);
                }
        }
 }
@@ -382,11 +413,11 @@ void Mem_PrintList(int listallocations)
                   "size    name\n");
        for (pool = poolchain;pool;pool = pool->next)
        {
-               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" : "");
+               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);
        }
 }