X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=a4f852dc1c5143e22567acc0caa77a2ab43f0920;hb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;hp=12809647893a9d114eed9774404b60449ab40b62;hpb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;p=xonotic%2Fdarkplaces.git

diff --git a/zone.h b/zone.h
index 12809647..a4f852dc 100644
--- a/zone.h
+++ b/zone.h
@@ -24,9 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // LordHavoc: this is pointless with a good C library
 //#define MEMCLUMPING
 
-#define POOLNAMESIZE 128
-// if set this pool will be printed in memlist reports
-#define POOLFLAG_TEMP 1
+// div0: heap overflow detection paranoia
+//#define MEMPARANOIA 1
+
 #if MEMCLUMPING
 // give malloc padding so we can't waste most of a page at the end
 #define MEMCLUMPSIZE (65536 - 1536)
@@ -34,11 +34,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MEMUNIT 8
 #define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
 #define MEMBITINTS (MEMBITS / 32)
-#define MEMCLUMP_SENTINEL 0xABADCAFE
 #endif
 
-#define MEMHEADER_SENTINEL1 0xDEADF00D
-#define MEMHEADER_SENTINEL2 0xDF
+#define POOLNAMESIZE 128
+// if set this pool will be printed in memlist reports
+#define POOLFLAG_TEMP 1
 
 typedef struct memheader_s
 {
@@ -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;
 }
@@ -135,6 +135,34 @@ 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
 extern mempool_t *tempmempool;