X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=6ee48e20035fbb913dc3db93a618f19c07739b5a;hb=7d751de254f2c6e983ad2c580b81602fc6963b29;hp=941f93277ccb08d3def511e43a0d799c87c23b55;hpb=43ee5e136a693ac9cfb40cb03fceea7d3149104f;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 941f9327..6ee48e20 100644
--- a/zone.c
+++ b/zone.c
@@ -21,6 +21,9 @@ 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, const char *filename, int fileline)
@@ -34,7 +37,10 @@ void *_Mem_Alloc(mempool_t *pool, int size, const 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)
@@ -136,7 +142,8 @@ void _Mem_Free(void *data, const char *filename, int 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);
+	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);
@@ -190,14 +197,15 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 	{
 #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, 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));
@@ -208,10 +216,12 @@ mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline)
 	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;
@@ -219,7 +229,8 @@ mempool_t *_Mem_AllocPool(const char *name, const 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)
@@ -236,6 +247,11 @@ void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
 		while ((*pool)->chain)
 			Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)));
 
+		// 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);
@@ -245,6 +261,8 @@ 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)
@@ -255,6 +273,12 @@ 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)));
+
+	// 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, const char *filename, int fileline)
@@ -306,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
@@ -325,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->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);
+		}
 	}
 }
 
@@ -341,14 +378,11 @@ 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->next)
@@ -373,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();
 }
 
@@ -394,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);
 }