X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=941f93277ccb08d3def511e43a0d799c87c23b55;hb=58fb771fc98f2d04990c947944cd199007ea1666;hp=a6b7cf2bc09ba8defb975355b01a3df2e2807da3;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/zone.c b/zone.c
index a6b7cf2b..941f9327 100644
--- a/zone.c
+++ b/zone.c
@@ -23,16 +23,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 mempool_t *poolchain = NULL;
 
-void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
+void *_Mem_Alloc(mempool_t *pool, int size, const char *filename, int fileline)
 {
+#if MEMCLUMPING
 	int i, j, k, needed, endbit, largest;
 	memclump_t *clump, **clumpchainpointer;
+#endif
 	memheader_t *mem;
 	if (size <= 0)
 		return NULL;
 	if (pool == NULL)
-		Host_Error("Mem_Alloc: 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);
 	pool->totalsize += size;
+#if MEMCLUMPING
 	if (size < 4096)
 	{
 		// clumping
@@ -42,9 +46,9 @@ void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
 		{
 			clump = *clumpchainpointer;
 			if (clump->sentinel1 != MEMCLUMP_SENTINEL)
-				Sys_Error("Mem_Alloc: trashed clump sentinel 1\n");
+				Sys_Error("Mem_Alloc: trashed clump sentinel 1 (alloc at %s:%d)", filename, fileline);
 			if (clump->sentinel2 != MEMCLUMP_SENTINEL)
-				Sys_Error("Mem_Alloc: trashed clump sentinel 2\n");
+				Sys_Error("Mem_Alloc: trashed clump sentinel 2 (alloc at %s:%d)", filename, fileline);
 			if (clump->largestavailable >= needed)
 			{
 				largest = 0;
@@ -70,7 +74,7 @@ void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
 		pool->realsize += sizeof(memclump_t);
 		clump = malloc(sizeof(memclump_t));
 		if (clump == NULL)
-			Host_Error("Mem_Alloc: out of memory");
+			Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
 		memset(clump, 0, sizeof(memclump_t));
 		*clumpchainpointer = clump;
 		clump->sentinel1 = MEMCLUMP_SENTINEL;
@@ -80,7 +84,7 @@ void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
 		clump->largestavailable = MEMBITS - needed;
 		j = 0;
 choseclump:
-		mem = (memheader_t *)((long) clump->block + j * MEMUNIT);
+		mem = (memheader_t *)((qbyte *) clump->block + j * MEMUNIT);
 		mem->clump = clump;
 		clump->blocksinuse += needed;
 		for (i = j + needed;j < i;j++)
@@ -89,131 +93,148 @@ choseclump:
 	else
 	{
 		// big allocations are not clumped
+#endif
 		pool->realsize += sizeof(memheader_t) + size + sizeof(int);
 		mem = malloc(sizeof(memheader_t) + size + sizeof(int));
 		if (mem == NULL)
-			Host_Error("Mem_Alloc: out of memory");
+			Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
+#if MEMCLUMPING
 		mem->clump = NULL;
 	}
+#endif
 	mem->filename = filename;
 	mem->fileline = fileline;
 	mem->size = size;
 	mem->pool = pool;
-	mem->sentinel1 = MEMHEADER_SENTINEL;
-	*((int *)((long) mem + sizeof(memheader_t) + mem->size)) = MEMHEADER_SENTINEL;
+	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;
 	// append to head of list
-	mem->chain = pool->chain;
+	mem->next = pool->chain;
+	mem->prev = NULL;
 	pool->chain = mem;
-	memset((void *)((long) mem + sizeof(memheader_t)), 0, mem->size);
-	return (void *)((long) mem + sizeof(memheader_t));
+	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)
+void _Mem_Free(void *data, const char *filename, int fileline)
 {
+#if MEMCLUMPING
 	int i, firstblock, endblock;
 	memclump_t *clump, **clumpchainpointer;
-	memheader_t *mem, **memchainpointer;
+#endif
+	memheader_t *mem;
 	mempool_t *pool;
 	if (data == NULL)
-		Host_Error("Mem_Free: data == NULL");
-
+		Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
 
-	mem = (memheader_t *)((long) data - sizeof(memheader_t));
-	if (mem->sentinel1 != MEMHEADER_SENTINEL)
-		Sys_Error("Mem_Free: trashed header sentinel 1 (block allocated in %s:%i)\n", mem->filename, mem->fileline);
-	if (*((int *)((long) mem + sizeof(memheader_t) + mem->size)) != MEMHEADER_SENTINEL)
-		Sys_Error("Mem_Free: trashed header sentinel 2 (block allocated in %s:%i)\n", mem->filename, mem->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;
-	for (memchainpointer = &pool->chain;*memchainpointer;memchainpointer = &(*memchainpointer)->chain)
+	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);
+	// 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 ((clump = mem->clump))
+			// unlink from chain
+			for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain)
 			{
-				if (clump->sentinel1 != MEMCLUMP_SENTINEL)
-					Sys_Error("Mem_Alloc: trashed clump sentinel 1\n");
-				if (clump->sentinel2 != MEMCLUMP_SENTINEL)
-					Sys_Error("Mem_Alloc: trashed clump sentinel 2\n");
-				firstblock = ((long) mem - (long) clump->block);
-				if (firstblock & (MEMUNIT - 1))
-					Host_Error("Mem_Free: address not valid in clump\n");
-				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)
-				{
-					// 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
+				if (*clumpchainpointer == clump)
 				{
-					// 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(memheader_t) + mem->size + sizeof(int);
-				memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
-				free(mem);
-			}
-			return;
+			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;
 		}
 	}
-	Host_Error("Mem_Free: not allocated\n");
+	else
+	{
+#endif
+		pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
+		memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
+		free(mem);
+#if MEMCLUMPING
+	}
+#endif
 }
 
-mempool_t *Mem_AllocPool(char *name)
+mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline)
 {
-//	int i;
 	mempool_t *pool;
 	pool = malloc(sizeof(mempool_t));
 	if (pool == NULL)
-		Host_Error("Mem_AllocPool: out of memory");
+		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->chain = NULL;
 	pool->totalsize = 0;
 	pool->realsize = sizeof(mempool_t);
 	strcpy(pool->name, name);
-//	for (i = 0;i < (POOLNAMESIZE - 1) && name[i];i++)
-//		pool->name[i] = name[i];
-//	for (i = 0;i < POOLNAMESIZE;i++)
-//		pool->name[i] = 0;
 	pool->next = poolchain;
 	poolchain = pool;
 	return pool;
 }
 
-void Mem_FreePool(mempool_t **pool)
+void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
 {
 	mempool_t **chainaddress;
 	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)
-			Host_Error("Mem_FreePool: pool already free");
+			Sys_Error("Mem_FreePool: pool already free (freepool at %s:%i)", filename, fileline);
 		*chainaddress = (*pool)->next;
 
 		// free memory owned by the pool
 		while ((*pool)->chain)
-			Mem_Free((void *)((long) (*pool)->chain + sizeof(memheader_t)));
+			Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)));
 
 		// free the pool itself
 		memset(*pool, 0xBF, sizeof(mempool_t));
@@ -222,54 +243,72 @@ void Mem_FreePool(mempool_t **pool)
 	}
 }
 
-void Mem_EmptyPool(mempool_t *pool)
+void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline)
 {
 	if (pool == NULL)
-		Con_Printf("Mem_EmptyPool: pool == NULL\n");
+		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 *)((long) pool->chain + sizeof(memheader_t)));
+		Mem_Free((void *)((qbyte *) pool->chain + sizeof(memheader_t)));
 }
 
-void _Mem_CheckSentinels(void *data, char *filename, int fileline)
+void _Mem_CheckSentinels(void *data, const char *filename, int fileline)
 {
 	memheader_t *mem;
 
 	if (data == NULL)
-		Host_Error("Mem_CheckSentinels: data == NULL\n");
+		Sys_Error("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline);
 
-	mem = (memheader_t *)((long) data - sizeof(memheader_t));
-	if (mem->sentinel1 != MEMHEADER_SENTINEL)
-		Host_Error("Mem_CheckSentinels: trashed header sentinel 1 (block allocated at %s:%i, sentinel check at %s:%i)\n", mem->filename, mem->fileline, filename, fileline);
-	if (*((int *)((long) mem + sizeof(memheader_t) + mem->size)) != MEMHEADER_SENTINEL)
-		Host_Error("Mem_CheckSentinels: trashed header sentinel 2 (block allocated at %s:%i, sentinel check at %s:%i)\n", mem->filename, mem->fileline, filename, fileline);
+	mem = (memheader_t *)((qbyte *) 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)
+		Sys_Error("Mem_CheckSentinels: trashed header sentinel 2 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
 }
 
-static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int fileline)
+#if MEMCLUMPING
+static void _Mem_CheckClumpSentinels(memclump_t *clump, const char *filename, int fileline)
 {
 	// this isn't really very useful
 	if (clump->sentinel1 != MEMCLUMP_SENTINEL)
-		Host_Error("Mem_CheckClumpSentinels: trashed sentinel 1 (sentinel check at %s:%i)\n", filename, fileline);
+		Sys_Error("Mem_CheckClumpSentinels: trashed sentinel 1 (sentinel check at %s:%i)", filename, fileline);
 	if (clump->sentinel2 != MEMCLUMP_SENTINEL)
-		Host_Error("Mem_CheckClumpSentinels: trashed sentinel 2 (sentinel check at %s:%i)\n", filename, fileline);
+		Sys_Error("Mem_CheckClumpSentinels: trashed sentinel 2 (sentinel check at %s:%i)", filename, fileline);
 }
+#endif
 
-void _Mem_CheckSentinelsGlobal(char *filename, int fileline)
+void _Mem_CheckSentinelsGlobal(const char *filename, int fileline)
 {
 	memheader_t *mem;
+#if MEMCLUMPING
 	memclump_t *clump;
+#endif
 	mempool_t *pool;
 	for (pool = poolchain;pool;pool = pool->next)
 	{
-		for (mem = pool->chain;mem;mem = mem->chain)
-			_Mem_CheckSentinels((void *)((long) mem + sizeof(memheader_t)), filename, fileline);
+		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
 }
 
-// used for temporary memory allocations around the engine, not for longterm storage
+// 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
 mempool_t *tempmempool;
 // only for zone
 mempool_t *zonemempool;
@@ -278,6 +317,8 @@ void Mem_PrintStats(void)
 {
 	int count = 0, size = 0;
 	mempool_t *pool;
+	memheader_t *mem;
+	Mem_CheckSentinelsGlobal();
 	for (pool = poolchain;pool;pool = pool->next)
 	{
 		count++;
@@ -287,12 +328,19 @@ void Mem_PrintStats(void)
 	if (tempmempool == NULL)
 		Con_Printf("Error: no tempmempool allocated\n");
 	else if (tempmempool->chain)
+	{
 		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);
+	}
 }
 
-void Mem_PrintList_f(void)
+void Mem_PrintList(int listallocations)
 {
 	mempool_t *pool;
+	memheader_t *mem;
+	Mem_CheckSentinelsGlobal();
 	Con_Printf("memory pool list:\n"
 	           "size    name\n");
 	for (pool = poolchain;pool;pool = pool->next)
@@ -302,13 +350,38 @@ void Mem_PrintList_f(void)
 		else
 			Con_Printf("%6ik (%6ik 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)
+				Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline);
+	}
+}
+
+void MemList_f(void)
+{
+	switch(Cmd_Argc())
+	{
+	case 1:
+		Mem_PrintList(false);
+		Mem_PrintStats();
+		break;
+	case 2:
+		if (!strcmp(Cmd_Argv(1), "all"))
+		{
+			Mem_PrintList(true);
+			Mem_PrintStats();
+			break;
+		}
+		// drop through
+	default:
+		Con_Printf("MemList_f: unrecognized options\nusage: memlist [all]\n");
+		break;
 	}
-	Mem_PrintStats();
 }
 
 extern void R_TextureStats_PrintTotal(void);
-void Memstats_f(void)
+void MemStats_f(void)
 {
+	Mem_CheckSentinelsGlobal();
 	R_TextureStats_PrintTotal();
 	Mem_PrintStats();
 }
@@ -327,7 +400,7 @@ void Memory_Init (void)
 
 void Memory_Init_Commands (void)
 {
-	Cmd_AddCommand ("memstats", Memstats_f);
-	Cmd_AddCommand ("memlist", Mem_PrintList_f);
+	Cmd_AddCommand ("memstats", MemStats_f);
+	Cmd_AddCommand ("memlist", MemList_f);
 }