X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=8eb9196708e9c120d5bd1e7def54bc6fa437301c;hb=931655a1435c4855ba700bd63c28ff22744b48c5;hp=309658339089c025b16db7d6d470b59b6608f98a;hpb=30334016020f54bb93999010bed118f5605b06bd;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 30965833..8eb91967 100644
--- a/zone.c
+++ b/zone.c
@@ -21,8 +21,8 @@ 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"};
+cvar_t developer_memory = {0, "developer_memory", "0", "prints debugging information about memory allocations"};
+cvar_t developer_memorydebug = {0, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
 
 mempool_t *poolchain = NULL;
 
@@ -90,7 +90,7 @@ void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int filelin
 		clump->largestavailable = MEMBITS - needed;
 		j = 0;
 choseclump:
-		mem = (memheader_t *)((qbyte *) clump->block + j * MEMUNIT);
+		mem = (memheader_t *)((unsigned char *) clump->block + j * MEMUNIT);
 		mem->clump = clump;
 		clump->blocksinuse += needed;
 		for (i = j + needed;j < i;j++)
@@ -101,7 +101,7 @@ choseclump:
 		// big allocations are not clumped
 #endif
 		pool->realsize += sizeof(memheader_t) + size + sizeof(int);
-		mem = malloc(sizeof(memheader_t) + size + sizeof(int));
+		mem = (memheader_t *)malloc(sizeof(memheader_t) + size + sizeof(int));
 		if (mem == NULL)
 			Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
 #if MEMCLUMPING
@@ -114,15 +114,15 @@ choseclump:
 	mem->pool = pool;
 	mem->sentinel1 = MEMHEADER_SENTINEL1;
 	// we have to use only a single byte for this sentinel, because it may not be aligned, and some platforms can't use unaligned accesses
-	*((qbyte *) mem + sizeof(memheader_t) + mem->size) = MEMHEADER_SENTINEL2;
+	*((unsigned char *) mem + sizeof(memheader_t) + mem->size) = MEMHEADER_SENTINEL2;
 	// append to head of list
 	mem->next = pool->chain;
 	mem->prev = NULL;
 	pool->chain = mem;
 	if (mem->next)
 		mem->next->prev = mem;
-	memset((void *)((qbyte *) mem + sizeof(memheader_t)), 0, mem->size);
-	return (void *)((qbyte *) mem + sizeof(memheader_t));
+	memset((void *)((unsigned char *) mem + sizeof(memheader_t)), 0, mem->size);
+	return (void *)((unsigned char *) mem + sizeof(memheader_t));
 }
 
 void _Mem_Free(void *data, const char *filename, int fileline)
@@ -135,11 +135,17 @@ 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));
+	mem = (memheader_t *)((unsigned char *) data - sizeof(memheader_t));
 	if (mem->sentinel1 != MEMHEADER_SENTINEL1)
 		Sys_Error("Mem_Free: trashed header sentinel 1 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
-	if (*((qbyte *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2)
+	if (*((unsigned char *) 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;
 	if (developer.integer && developer_memory.integer)
@@ -162,7 +168,7 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 			Sys_Error("Mem_Free: trashed clump sentinel 1 (free at %s:%i)", filename, fileline);
 		if (clump->sentinel2 != MEMCLUMP_SENTINEL)
 			Sys_Error("Mem_Free: trashed clump sentinel 2 (free at %s:%i)", filename, fileline);
-		firstblock = ((qbyte *) mem - (qbyte *) clump->block);
+		firstblock = ((unsigned char *) mem - (unsigned char *) clump->block);
 		if (firstblock & (MEMUNIT - 1))
 			Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline);
 		firstblock /= MEMUNIT;
@@ -208,7 +214,9 @@ 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;
-	pool = malloc(sizeof(mempool_t));
+	if (developer.integer && developer_memorydebug.integer)
+		_Mem_CheckSentinelsGlobal(filename, fileline);
+	pool = (mempool_t *)malloc(sizeof(mempool_t));
 	if (pool == NULL)
 		Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
 	memset(pool, 0, sizeof(mempool_t));
@@ -231,21 +239,23 @@ 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
 		while ((*pool)->chain)
-			_Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)), filename, fileline);
+			_Mem_Free((void *)((unsigned char *) (*pool)->chain + sizeof(memheader_t)), filename, fileline);
 
 		// free child pools, too
 		for(iter = poolchain; iter; temp = iter = iter->next)
@@ -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)
@@ -272,7 +292,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)), filename, fileline);
+		_Mem_Free((void *)((unsigned char *) pool->chain + sizeof(memheader_t)), filename, fileline);
 
 	// empty child pools, too
 	for(chainaddress = poolchain; chainaddress; chainaddress = chainaddress->next)
@@ -288,10 +308,10 @@ void _Mem_CheckSentinels(void *data, const char *filename, int fileline)
 	if (data == NULL)
 		Sys_Error("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline);
 
-	mem = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+	mem = (memheader_t *)((unsigned char *) data - sizeof(memheader_t));
 	if (mem->sentinel1 != MEMHEADER_SENTINEL1)
 		Sys_Error("Mem_CheckSentinels: trashed header sentinel 1 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
-	if (*((qbyte *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2)
+	if (*((unsigned char *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2)
 		Sys_Error("Mem_CheckSentinels: trashed header sentinel 2 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
 }
 
@@ -322,7 +342,7 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline)
 	}
 	for (pool = poolchain;pool;pool = pool->next)
 		for (mem = pool->chain;mem;mem = mem->next)
-			_Mem_CheckSentinels((void *)((qbyte *) mem + sizeof(memheader_t)), filename, fileline);
+			_Mem_CheckSentinels((void *)((unsigned char *) mem + sizeof(memheader_t)), filename, fileline);
 #if MEMCLUMPING
 	for (pool = poolchain;pool;pool = pool->next)
 		for (clump = pool->clumpchain;clump;clump = clump->chain)
@@ -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 *)((unsigned char *) 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, realsize = 0;
 	mempool_t *pool;
 	memheader_t *mem;
 	Mem_CheckSentinelsGlobal();
@@ -360,15 +391,17 @@ void Mem_PrintStats(void)
 	{
 		count++;
 		size += pool->totalsize;
+		realsize += pool->realsize;
 	}
-	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);
+	Con_Printf("total allocated size: %lu bytes (%.3fMB)\n", (unsigned long)realsize, realsize / 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 +415,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);
 	}
 }
 
@@ -441,8 +474,8 @@ void Memory_Shutdown (void)
 
 void Memory_Init_Commands (void)
 {
-	Cmd_AddCommand ("memstats", MemStats_f);
-	Cmd_AddCommand ("memlist", MemList_f);
+	Cmd_AddCommand ("memstats", MemStats_f, "prints memory system statistics");
+	Cmd_AddCommand ("memlist", MemList_f, "prints memory pool information (and individual allocations if used as memlist all)");
 	Cvar_RegisterVariable (&developer_memory);
 	Cvar_RegisterVariable (&developer_memorydebug);
 }