X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=5d88c77307323297e3161d16dd314ddc1862c234;hb=d9c86e8e4cd0f66c6033d49d07c3f008cdfcd48a;hp=74f20c6dd30fe3b78e1d1e9193024b2c10d691c5;hpb=190a74cbf9792407ff3fc9abc9654f933fdeda8a;p=xonotic%2Fdarkplaces.git

diff --git a/zone.h b/zone.h
index 74f20c6d..5d88c773 100644
--- a/zone.h
+++ b/zone.h
@@ -52,7 +52,7 @@ typedef struct memheader_s
 	struct memclump_s *clump;
 #endif
 	// size of the memory after the header (excluding header and sentinel2)
-	int size;
+	size_t size;
 	// file name and line where Mem_Alloc was called
 	const char *filename;
 	int fileline;
@@ -66,7 +66,7 @@ memheader_t;
 typedef struct memclump_s
 {
 	// contents of the clump
-	qbyte block[MEMCLUMPSIZE];
+	unsigned char block[MEMCLUMPSIZE];
 	// should always be MEMCLUMP_SENTINEL
 	unsigned int sentinel1;
 	// if a bit is on, it means that the MEMUNIT bytes it represents are
@@ -75,10 +75,10 @@ typedef struct memclump_s
 	// should always be MEMCLUMP_SENTINEL
 	unsigned int sentinel2;
 	// if this drops to 0, the clump is freed
-	int blocksinuse;
+	size_t blocksinuse;
 	// largest block of memory available (this is reset to an optimistic
 	// number when anything is freed, and updated when alloc fails the clump)
-	int largestavailable;
+	size_t largestavailable;
 	// next clump in the chain
 	struct memclump_s *chain;
 }
@@ -103,8 +103,6 @@ typedef struct mempool_s
 	size_t realsize;
 	// updated each time the pool is displayed by memlist, shows change from previous time (unless pool was freed)
 	size_t lastchecksize;
-	// name of the pool
-	char name[POOLNAMESIZE];
 	// linked into global mempool list
 	struct mempool_s *next;
 	// parent object (used for nested memory pools)
@@ -112,6 +110,8 @@ typedef struct mempool_s
 	// file name and line where Mem_AllocPool was called
 	const char *filename;
 	int fileline;
+	// name of the pool
+	char name[POOLNAMESIZE];
 	// should always be MEMHEADER_SENTINEL1
 	unsigned int sentinel2;
 }
@@ -132,10 +132,39 @@ void _Mem_FreePool(mempool_t **pool, const char *filename, int fileline);
 void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline);
 void _Mem_CheckSentinels(void *data, const char *filename, int fileline);
 void _Mem_CheckSentinelsGlobal(const char *filename, int fileline);
+// if pool is NULL this searches ALL pools for the allocation
 qboolean Mem_IsAllocated(mempool_t *pool, void *data);
 
+char* Mem_strdup (mempool_t *pool, const char* s);
+
+typedef struct memexpandablearray_array_s
+{
+	unsigned char *data;
+	unsigned char *allocflags;
+	size_t numflaggedrecords;
+}
+memexpandablearray_array_t;
+
+typedef struct memexpandablearray_s
+{
+	mempool_t *mempool;
+	size_t recordsize;
+	size_t numrecordsperarray;
+	size_t numarrays;
+	size_t maxarrays;
+	memexpandablearray_array_t *arrays;
+}
+memexpandablearray_t;
+
+void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, size_t recordsize, int numrecordsperarray);
+void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l);
+void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l);
+void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record);
+size_t Mem_ExpandableArray_IndexRange(const memexpandablearray_t *l) DP_FUNC_PURE;
+void *Mem_ExpandableArray_RecordAtIndex(const memexpandablearray_t *l, size_t index) DP_FUNC_PURE;
+
 // used for temporary allocations
-mempool_t *tempmempool;
+extern mempool_t *tempmempool;
 
 void Memory_Init (void);
 void Memory_Shutdown (void);