X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=da47317837585bac23fce699934c5aed92785cb0;hb=8abf1b158a01589db8bc74a7d1ecd501ae3845a0;hp=21b0fb060e500f746ed98ff010cd940d672d0d50;hpb=3d1d0d9ea08908a062cd80bee39ac05bef5aa78b;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index 21b0fb06..da473178 100644
--- a/zone.c
+++ b/zone.c
@@ -204,7 +204,7 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 #endif
 }
 
-mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline)
+mempool_t *_Mem_AllocPool(const char *name, mempool_t *parent, const char *filename, int fileline)
 {
 	mempool_t *pool;
 	pool = malloc(sizeof(mempool_t));
@@ -218,7 +218,8 @@ mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline)
 	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;
@@ -226,7 +227,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)
@@ -243,6 +245,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);
@@ -252,6 +259,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)
@@ -262,6 +271,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)
@@ -353,9 +368,9 @@ void Mem_PrintList(int listallocations)
 	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);
+			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("%6ik (%6ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name);
+			Con_Printf("%10ik (%10ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name);
 		pool->lastchecksize = pool->totalsize;
 		if (listallocations)
 			for (mem = pool->chain;mem;mem = mem->next)
@@ -403,6 +418,7 @@ void Memory_Init (void)
 {
 	tempmempool = Mem_AllocPool("Temporary Memory");
 	zonemempool = Mem_AllocPool("Zone");
+	poolchain = NULL;
 }
 
 void Memory_Init_Commands (void)