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

diff --git a/zone.c b/zone.c
index f5fdf73c..30965833 100644
--- a/zone.c
+++ b/zone.c
@@ -21,9 +21,12 @@ 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"};
+
 mempool_t *poolchain = NULL;
 
-void *_Mem_Alloc(mempool_t *pool, int size, 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;
@@ -34,7 +37,10 @@ void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
 		return NULL;
 	if (pool == NULL)
 		Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
-	Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, size);
+	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)
@@ -110,111 +116,127 @@ choseclump:
 	// 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;
 	// append to head of list
-	mem->chain = pool->chain;
+	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));
 }
 
-void _Mem_Free(void *data, char *filename, int fileline)
+void _Mem_Free(void *data, const char *filename, int fileline)
 {
 #if MEMCLUMPING
 	int i, firstblock, endblock;
 	memclump_t *clump, **clumpchainpointer;
 #endif
-	memheader_t *mem, **memchainpointer;
+	memheader_t *mem;
 	mempool_t *pool;
 	if (data == NULL)
 		Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
 
-
 	mem = (memheader_t *)((qbyte *) 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)
 		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;
-	Con_DPrintf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size);
-	for (memchainpointer = &pool->chain;*memchainpointer;memchainpointer = &(*memchainpointer)->chain)
+	if (developer.integer && developer_memory.integer)
+		Con_Printf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size);
+	// unlink memheader from doubly linked list
+	if ((mem->prev ? mem->prev->next != mem : pool->chain != mem) || (mem->next && mem->next->prev != mem))
+		Sys_Error("Mem_Free: not allocated or double freed (free at %s:%i)", filename, fileline);
+	if (mem->prev)
+		mem->prev->next = mem->next;
+	else
+		pool->chain = mem->next;
+	if (mem->next)
+		mem->next->prev = mem->prev;
+	// memheader has been unlinked, do the actual free now
+	pool->totalsize -= mem->size;
+#if MEMCLUMPING
+	if ((clump = mem->clump))
 	{
-		if (*memchainpointer == mem)
+		if (clump->sentinel1 != MEMCLUMP_SENTINEL)
+			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);
+		if (firstblock & (MEMUNIT - 1))
+			Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline);
+		firstblock /= MEMUNIT;
+		endblock = firstblock + ((sizeof(memheader_t) + mem->size + sizeof(int) + (MEMUNIT - 1)) / MEMUNIT);
+		clump->blocksinuse -= endblock - firstblock;
+		// could use &, but we know the bit is set
+		for (i = firstblock;i < endblock;i++)
+			clump->bits[i >> 5] -= (1 << (i & 31));
+		if (clump->blocksinuse <= 0)
 		{
-			*memchainpointer = mem->chain;
-			pool->totalsize -= mem->size;
-#if MEMCLUMPING
-			if ((clump = mem->clump))
+			// unlink from chain
+			for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain)
 			{
-				if (clump->sentinel1 != MEMCLUMP_SENTINEL)
-					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);
-				if (firstblock & (MEMUNIT - 1))
-					Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline);
-				firstblock /= MEMUNIT;
-				endblock = firstblock + ((sizeof(memheader_t) + mem->size + sizeof(int) + (MEMUNIT - 1)) / MEMUNIT);
-				clump->blocksinuse -= endblock - firstblock;
-				// could use &, but we know the bit is set
-				for (i = firstblock;i < endblock;i++)
-					clump->bits[i >> 5] -= (1 << (i & 31));
-				if (clump->blocksinuse <= 0)
+				if (*clumpchainpointer == clump)
 				{
-					// unlink from chain
-					for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain)
-					{
-						if (*clumpchainpointer == clump)
-						{
-							*clumpchainpointer = clump->chain;
-							break;
-						}
-					}
-					pool->realsize -= sizeof(memclump_t);
-					memset(clump, 0xBF, sizeof(memclump_t));
-					free(clump);
-				}
-				else
-				{
-					// clump still has some allocations
-					// force re-check of largest available space on next alloc
-					clump->largestavailable = MEMBITS - clump->blocksinuse;
+					*clumpchainpointer = clump->chain;
+					break;
 				}
 			}
-			else
-			{
+			pool->realsize -= sizeof(memclump_t);
+			memset(clump, 0xBF, sizeof(memclump_t));
+			free(clump);
+		}
+		else
+		{
+			// clump still has some allocations
+			// force re-check of largest available space on next alloc
+			clump->largestavailable = MEMBITS - clump->blocksinuse;
+		}
+	}
+	else
+	{
 #endif
-				pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
-				memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
-				free(mem);
+		pool->realsize -= 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
-			return;
-		}
 	}
-	Sys_Error("Mem_Free: not allocated (free at %s:%i)", filename, fileline);
+#endif
 }
 
-mempool_t *_Mem_AllocPool(char *name, 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 (pool == NULL)
 		Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
 	memset(pool, 0, sizeof(mempool_t));
+	pool->sentinel1 = MEMHEADER_SENTINEL1;
+	pool->sentinel2 = MEMHEADER_SENTINEL1;
+	pool->filename = filename;
+	pool->fileline = fileline;
+	pool->flags = flags;
 	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, char *filename, int fileline)
+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)
+			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)
@@ -223,7 +245,12 @@ void _Mem_FreePool(mempool_t **pool, 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));
@@ -232,17 +259,29 @@ void _Mem_FreePool(mempool_t **pool, char *filename, int fileline)
 	}
 }
 
-void _Mem_EmptyPool(mempool_t *pool, 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)
+		Sys_Error("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+	if (pool->sentinel2 != MEMHEADER_SENTINEL1)
+		Sys_Error("Mem_EmptyPool: trashed pool sentinel 2 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, 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)
+		if(chainaddress->parent == pool)
+			_Mem_EmptyPool(chainaddress, filename, fileline);
+
 }
 
-void _Mem_CheckSentinels(void *data, char *filename, int fileline)
+void _Mem_CheckSentinels(void *data, const char *filename, int fileline)
 {
 	memheader_t *mem;
 
@@ -257,7 +296,7 @@ void _Mem_CheckSentinels(void *data, char *filename, int fileline)
 }
 
 #if MEMCLUMPING
-static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int fileline)
+static void _Mem_CheckClumpSentinels(memclump_t *clump, const char *filename, int fileline)
 {
 	// this isn't really very useful
 	if (clump->sentinel1 != MEMCLUMP_SENTINEL)
@@ -267,7 +306,7 @@ static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int file
 }
 #endif
 
-void _Mem_CheckSentinelsGlobal(char *filename, int fileline)
+void _Mem_CheckSentinelsGlobal(const char *filename, int fileline)
 {
 	memheader_t *mem;
 #if MEMCLUMPING
@@ -275,18 +314,35 @@ void _Mem_CheckSentinelsGlobal(char *filename, int fileline)
 #endif
 	mempool_t *pool;
 	for (pool = poolchain;pool;pool = pool->next)
-#if MEMCLUMPING
 	{
-#endif
-		for (mem = pool->chain;mem;mem = mem->chain)
+		if (pool->sentinel1 != MEMHEADER_SENTINEL1)
+			Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 1 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+		if (pool->sentinel2 != MEMHEADER_SENTINEL1)
+			Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 2 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, 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);
 #if MEMCLUMPING
+	for (pool = poolchain;pool;pool = pool->next)
 		for (clump = pool->clumpchain;clump;clump = clump->chain)
 			_Mem_CheckClumpSentinels(clump, filename, 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
@@ -306,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_Printf("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_Printf("listing temporary memory allocations:\n");
-		for (mem = tempmempool->chain;mem;mem = mem->chain)
-			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);
+		}
 	}
 }
 
@@ -322,17 +378,14 @@ void Mem_PrintList(int listallocations)
 	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("%6ik (%6ik 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 (%+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->chain)
+			for (mem = pool->chain;mem;mem = mem->next)
 				Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline);
 	}
 }
@@ -354,16 +407,16 @@ void MemList_f(void)
 		}
 		// 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();
 }
 
@@ -375,13 +428,22 @@ 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);
 	Cmd_AddCommand ("memlist", MemList_f);
+	Cvar_RegisterVariable (&developer_memory);
+	Cvar_RegisterVariable (&developer_memorydebug);
 }