X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=d4abe16d4ee90518991a6bb696f09574a0c72fbb;hb=1623101e24ba8a7d62168d2cd13583de23e08c34;hp=d487969644fb413c8e179e26b15d6c407af6b541;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/zone.h b/zone.h
index d4879696..d4abe16d 100644
--- a/zone.h
+++ b/zone.h
@@ -18,47 +18,60 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef ZONE_H
+#define ZONE_H
+
+// LordHavoc: this is pointless with a good C library
+//#define MEMCLUMPING
+
 #define POOLNAMESIZE 128
+#if MEMCLUMPING
 // give malloc padding so we can't waste most of a page at the end
 #define MEMCLUMPSIZE (65536 - 1536)
 // smallest unit we care about is this many bytes
 #define MEMUNIT 8
 #define MEMBITS (MEMCLUMPSIZE / MEMUNIT)
 #define MEMBITINTS (MEMBITS / 32)
+#define MEMCLUMP_SENTINEL 0xABADCAFE
+#endif
 
-#define MEMHEADER_SENTINEL 0xABADCAFE
-#define MEMCLUMP_SENTINEL 0xDEADF00D
+#define MEMHEADER_SENTINEL1 0xDEADF00D
+#define MEMHEADER_SENTINEL2 0xDF
 
 typedef struct memheader_s
 {
-	// next memheader in chain belonging to pool
-	struct memheader_s *chain;
+	// next and previous memheaders in chain belonging to pool
+	struct memheader_s *next;
+	struct memheader_s *prev;
 	// pool this memheader belongs to
 	struct mempool_s *pool;
+#if MEMCLUMPING
 	// clump this memheader lives in, NULL if not in a clump
 	struct memclump_s *clump;
+#endif
 	// size of the memory after the header (excluding header and sentinel2)
 	int size;
 	// file name and line where Mem_Alloc was called
-	char *filename;
+	const char *filename;
 	int fileline;
-	// should always be MEMHEADER_SENTINEL
-	int sentinel1;
-	// immediately followed by data, which is followed by another MEMHEADER_SENTINEL
+	// should always be MEMHEADER_SENTINEL1
+	unsigned int sentinel1;
+	// immediately followed by data, which is followed by a MEMHEADER_SENTINEL2 byte
 }
 memheader_t;
 
+#if MEMCLUMPING
 typedef struct memclump_s
 {
 	// contents of the clump
-	byte block[MEMCLUMPSIZE];
+	qbyte block[MEMCLUMPSIZE];
 	// should always be MEMCLUMP_SENTINEL
-	int sentinel1;
+	unsigned int sentinel1;
 	// if a bit is on, it means that the MEMUNIT bytes it represents are
 	// allocated, otherwise free
 	int bits[MEMBITINTS];
 	// should always be MEMCLUMP_SENTINEL
-	int sentinel2;
+	unsigned int sentinel2;
 	// if this drops to 0, the clump is freed
 	int blocksinuse;
 	// largest block of memory available (this is reset to an optimistic
@@ -68,13 +81,18 @@ typedef struct memclump_s
 	struct memclump_s *chain;
 }
 memclump_t;
+#endif
 
 typedef struct mempool_s
 {
+	// should always be MEMHEADER_SENTINEL1
+	unsigned int sentinel1;
 	// chain of individual memory allocations
 	struct memheader_s *chain;
+#if MEMCLUMPING
 	// chain of clumps (if any)
 	struct memclump_s *clumpchain;
+#endif
 	// total memory allocated in this pool (inside memheaders)
 	int totalsize;
 	// total memory allocated in this pool (actual malloc total)
@@ -85,22 +103,29 @@ typedef struct mempool_s
 	char name[POOLNAMESIZE];
 	// linked into global mempool list
 	struct mempool_s *next;
+	// file name and line where Mem_AllocPool was called
+	const char *filename;
+	int fileline;
+	// should always be MEMHEADER_SENTINEL1
+	unsigned int sentinel2;
 }
 mempool_t;
 
 #define Mem_Alloc(pool,size) _Mem_Alloc(pool, size, __FILE__, __LINE__)
+#define Mem_Free(mem) _Mem_Free(mem, __FILE__, __LINE__)
 #define Mem_CheckSentinels(data) _Mem_CheckSentinels(data, __FILE__, __LINE__)
 #define Mem_CheckSentinelsGlobal() _Mem_CheckSentinelsGlobal(__FILE__, __LINE__)
+#define Mem_AllocPool(name) _Mem_AllocPool(name, __FILE__, __LINE__)
+#define Mem_FreePool(pool) _Mem_FreePool(pool, __FILE__, __LINE__)
+#define Mem_EmptyPool(pool) _Mem_EmptyPool(pool, __FILE__, __LINE__)
 
-void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline);
-void Mem_Free(void *data);
-mempool_t *Mem_AllocPool(char *name);
-void Mem_FreePool(mempool_t **pool);
-void Mem_EmptyPool(mempool_t *pool);
-void _Mem_CheckSentinels(void *data, char *filename, int fileline);
-void _Mem_CheckSentinelsGlobal(char *filename, int fileline);
-void Mem_PrintStats(void);
-void Mem_PrintList(void);
+void *_Mem_Alloc(mempool_t *pool, int size, const char *filename, int fileline);
+void _Mem_Free(void *data, const char *filename, int fileline);
+mempool_t *_Mem_AllocPool(const char *name, const char *filename, int fileline);
+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);
 
 // used for temporary allocations
 mempool_t *tempmempool;
@@ -111,3 +136,6 @@ void Memory_Init_Commands (void);
 extern mempool_t *zonemempool;
 #define Z_Malloc(size) Mem_Alloc(zonemempool,size)
 #define Z_Free(data) Mem_Free(data)
+
+#endif
+