X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=a4f852dc1c5143e22567acc0caa77a2ab43f0920;hb=cf7140c9799cb2d2f40f6dbfd6abeb9694645ad5;hp=9cdd9ff93e8620c259cd0f032094c5d453f1a13c;hpb=ce3be9028e11deb62fc4998791a02ed6b1f92895;p=xonotic%2Fdarkplaces.git diff --git a/zone.h b/zone.h index 9cdd9ff9..a4f852dc 100644 --- a/zone.h +++ b/zone.h @@ -24,7 +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 +// 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) @@ -32,16 +34,17 @@ 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 { - // 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 @@ -49,12 +52,12 @@ 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 - char *filename; + const char *filename; int fileline; // should always be MEMHEADER_SENTINEL1 - int sentinel1; + unsigned int sentinel1; // immediately followed by data, which is followed by a MEMHEADER_SENTINEL2 byte } memheader_t; @@ -63,19 +66,19 @@ memheader_t; typedef struct memclump_s { // contents of the clump - qbyte block[MEMCLUMPSIZE]; + unsigned char 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; + 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; } @@ -84,22 +87,33 @@ memclump_t; 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 + // POOLFLAG_* + int flags; // total memory allocated in this pool (inside memheaders) - int totalsize; + size_t totalsize; // total memory allocated in this pool (actual malloc total) - int realsize; + size_t realsize; // updated each time the pool is displayed by memlist, shows change from previous time (unless pool was freed) - int lastchecksize; - // name of the pool - char name[POOLNAMESIZE]; + size_t lastchecksize; // linked into global mempool list struct mempool_s *next; + // parent object (used for nested memory pools) + struct mempool_s *parent; + // 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; } mempool_t; @@ -107,27 +121,61 @@ mempool_t; #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_AllocPool(name, flags, parent) _Mem_AllocPool(name, flags, parent, __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, char *filename, int fileline); -mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline); -void _Mem_FreePool(mempool_t **pool, char *filename, int fileline); -void _Mem_EmptyPool(mempool_t *pool, char *filename, int fileline); -void _Mem_CheckSentinels(void *data, char *filename, int fileline); -void _Mem_CheckSentinelsGlobal(char *filename, int fileline); +void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int fileline); +void _Mem_Free(void *data, const char *filename, int fileline); +mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, 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); +// 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); void Memory_Init_Commands (void); extern mempool_t *zonemempool; #define Z_Malloc(size) Mem_Alloc(zonemempool,size) #define Z_Free(data) Mem_Free(data) +extern struct cvar_s developer_memory; +extern struct cvar_s developer_memorydebug; + #endif