X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=zone.c;h=32655d9ad143e38fa8e9d390d6f62dd2d4b8fcd4;hp=590dd8393ca8d74321b6615da17cdfe0d2bbc39f;hb=32ad538b7b2fb3349717631863dfdfe61358fe6c;hpb=aa33d8f8642530f7f266d6cde1422f95aa74b2be

diff --git a/zone.c b/zone.c
index 590dd839..32655d9a 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;
 
@@ -38,7 +38,7 @@ void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int filelin
 	if (pool == NULL)
 		Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
 	if (developer.integer && developer_memory.integer)
-		Con_Printf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, size);
+		Con_Printf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, (int)size);
 	if (developer.integer && developer_memorydebug.integer)
 		_Mem_CheckSentinelsGlobal(filename, fileline);
 	pool->totalsize += size;
@@ -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++)
@@ -114,42 +114,32 @@ 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)
+// only used by _Mem_Free and _Mem_FreePool
+static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline)
 {
 #if MEMCLUMPING
 	int i, firstblock, endblock;
 	memclump_t *clump, **clumpchainpointer;
 #endif
-	memheader_t *mem;
 	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));
 	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)
-		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);
+		Con_Printf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, (int)(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);
@@ -168,7 +158,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;
@@ -203,7 +193,7 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 	{
 #endif
 		pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
-		if (developer.integer)
+		if (developer_memorydebug.integer)
 			memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
 		free(mem);
 #if MEMCLUMPING
@@ -211,6 +201,21 @@ void _Mem_Free(void *data, const char *filename, int fileline)
 #endif
 }
 
+void _Mem_Free(void *data, const char *filename, int fileline)
+{
+	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_FreeBlock((memheader_t *)((unsigned char *) data - sizeof(memheader_t)), filename, fileline);
+}
+
 mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const char *filename, int fileline)
 {
 	mempool_t *pool;
@@ -235,37 +240,39 @@ mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const
 	return pool;
 }
 
-void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline)
+void _Mem_FreePool(mempool_t **poolpointer, const char *filename, int fileline)
 {
+	mempool_t *pool = *poolpointer;
 	mempool_t **chainaddress, *iter, *temp;
 
 	if (developer.integer && developer_memorydebug.integer)
 		_Mem_CheckSentinelsGlobal(filename, fileline);
-	if (*pool)
+	if (pool)
 	{
 		// unlink pool from chain
-		for (chainaddress = &poolchain;*chainaddress && *chainaddress != *pool;chainaddress = &((*chainaddress)->next));
-		if (*chainaddress != *pool)
+		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;
+		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);
+		while (pool->chain)
+			_Mem_FreeBlock(pool->chain, filename, fileline);
 
 		// free child pools, too
 		for(iter = poolchain; iter; temp = iter = iter->next)
-			if(iter->parent == *pool)
+			if(iter->parent == pool)
 				_Mem_FreePool(&temp, filename, fileline);
 
 		// free the pool itself
-		memset(*pool, 0xBF, sizeof(mempool_t));
-		free(*pool);
-		*pool = NULL;
+		memset(pool, 0xBF, sizeof(mempool_t));
+		free(pool);
+
+		*poolpointer = NULL;
 	}
 }
 
@@ -292,7 +299,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_FreeBlock(pool->chain, filename, fileline);
 
 	// empty child pools, too
 	for(chainaddress = poolchain; chainaddress; chainaddress = chainaddress->next)
@@ -308,10 +315,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);
 }
 
@@ -342,7 +349,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)
@@ -358,7 +365,7 @@ qboolean Mem_IsAllocated(mempool_t *pool, void *data)
 	if (pool)
 	{
 		// search only one pool
-		target = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+		target = (memheader_t *)((unsigned char *) data - sizeof(memheader_t));
 		for( header = pool->chain ; header ; header = header->next )
 			if( header == target )
 				return true;
@@ -373,6 +380,106 @@ qboolean Mem_IsAllocated(mempool_t *pool, void *data)
 	return false;
 }
 
+void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, size_t recordsize, int numrecordsperarray)
+{
+	memset(l, 0, sizeof(*l));
+	l->mempool = mempool;
+	l->recordsize = recordsize;
+	l->numrecordsperarray = numrecordsperarray;
+}
+
+void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l)
+{
+	size_t i;
+	if (l->maxarrays)
+	{
+		for (i = 0;i != l->numarrays;i++)
+			Mem_Free(l->arrays[i].data);
+		Mem_Free(l->arrays);
+	}
+	memset(l, 0, sizeof(*l));
+}
+
+void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l)
+{
+	size_t i, j;
+	for (i = 0;;i++)
+	{
+		if (i == l->numarrays)
+		{
+			if (l->numarrays == l->maxarrays)
+			{
+				memexpandablearray_array_t *oldarrays = l->arrays;
+				l->maxarrays = max(l->maxarrays * 2, 128);
+				l->arrays = Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays));
+				if (oldarrays)
+				{
+					memcpy(l->arrays, oldarrays, l->numarrays * sizeof(*l->arrays));
+					Mem_Free(oldarrays);
+				}
+			}
+			l->arrays[i].numflaggedrecords = 0;
+			l->arrays[i].data = Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray);
+			l->arrays[i].allocflags = l->arrays[i].data + l->recordsize * l->numrecordsperarray;
+			l->numarrays++;
+		}
+		if (l->arrays[i].numflaggedrecords < l->numrecordsperarray)
+		{
+			for (j = 0;j < l->numrecordsperarray;j++)
+			{
+				if (!l->arrays[i].allocflags[j])
+				{
+					l->arrays[i].allocflags[j] = true;
+					l->arrays[i].numflaggedrecords++;
+					return (void *)(l->arrays[i].data + l->recordsize * j);
+				}
+			}
+		}
+	}
+}
+
+void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record)
+{
+	size_t i, j;
+	unsigned char *p = (unsigned char *)record;
+	for (i = 0;i != l->numarrays;i++)
+	{
+		if (p >= l->arrays[i].data && p < (l->arrays[i].data + l->recordsize * l->numrecordsperarray))
+		{
+			j = (p - l->arrays[i].data) / l->recordsize;
+			if (p != l->arrays[i].data + j * l->recordsize)
+				Sys_Error("Mem_ExpandableArray_FreeRecord: no such record %p\n", p);
+			if (!l->arrays[i].allocflags[j])
+				Sys_Error("Mem_ExpandableArray_FreeRecord: record %p is already free!\n", p);
+			l->arrays[i].allocflags[j] = false;
+			l->arrays[i].numflaggedrecords--;
+			return;
+		}
+	}
+}
+
+size_t Mem_ExpandableArray_IndexRange(memexpandablearray_t *l)
+{
+	size_t i, j, k;
+	if (!l->numarrays)
+		return 0;
+	i = l->numarrays - 1;
+	for (j = 0, k = 0;k < l->arrays[i].numflaggedrecords;j++)
+		if (l->arrays[i].allocflags[j])
+			k++;
+	return l->numrecordsperarray * i + j;
+}
+
+void *Mem_ExpandableArray_RecordAtIndex(memexpandablearray_t *l, size_t index)
+{
+	size_t i, j;
+	i = index / l->numrecordsperarray;
+	j = index % l->numrecordsperarray;
+	if (i >= l->numarrays || !l->arrays[i].allocflags[j])
+		return NULL;
+	return (void *)(l->arrays[i].data + j * l->recordsize);
+}
+
 
 // used for temporary memory allocations around the engine, not for longterm
 // storage, if anything in this pool stays allocated during gameplay, it is
@@ -406,7 +513,7 @@ void Mem_PrintStats(void)
 	}
 }
 
-void Mem_PrintList(int listallocations)
+void Mem_PrintList(size_t minallocationsize)
 {
 	mempool_t *pool;
 	memheader_t *mem;
@@ -417,8 +524,8 @@ void Mem_PrintList(int listallocations)
 	{
 		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)
+		for (mem = pool->chain;mem;mem = mem->next)
+			if (mem->size >= minallocationsize)
 				Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline);
 	}
 }
@@ -428,17 +535,13 @@ void MemList_f(void)
 	switch(Cmd_Argc())
 	{
 	case 1:
-		Mem_PrintList(false);
+		Mem_PrintList(1<<30);
 		Mem_PrintStats();
 		break;
 	case 2:
-		if (!strcmp(Cmd_Argv(1), "all"))
-		{
-			Mem_PrintList(true);
-			Mem_PrintStats();
-			break;
-		}
-		// drop through
+		Mem_PrintList(atoi(Cmd_Argv(1)) * 1024);
+		Mem_PrintStats();
+		break;
 	default:
 		Con_Print("MemList_f: unrecognized options\nusage: memlist [all]\n");
 		break;
@@ -450,6 +553,7 @@ void MemStats_f(void)
 {
 	Mem_CheckSentinelsGlobal();
 	R_TextureStats_Print(false, false, true);
+	GL_Mesh_ListVBOs(false);
 	Mem_PrintStats();
 }
 
@@ -461,9 +565,9 @@ Memory_Init
 */
 void Memory_Init (void)
 {
+	poolchain = NULL;
 	tempmempool = Mem_AllocPool("Temporary Memory", POOLFLAG_TEMP, NULL);
 	zonemempool = Mem_AllocPool("Zone", 0, NULL);
-	poolchain = NULL;
 }
 
 void Memory_Shutdown (void)
@@ -474,8 +578,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 (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
 	Cvar_RegisterVariable (&developer_memory);
 	Cvar_RegisterVariable (&developer_memorydebug);
 }