X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=zone.h;h=5fe3c63d19a43f8121aa66bdeeda62b8966730eb;hb=c6d7670ed439522ba8be3959a0315cb8c4039a7f;hp=40f32298c7297123b5f714db319c613d226cb362;hpb=dbd8404191be9296fe8701d8a178db3de6b69eb1;p=xonotic%2Fdarkplaces.git diff --git a/zone.h b/zone.h index 40f32298..5fe3c63d 100644 --- a/zone.h +++ b/zone.h @@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef ZONE_H #define ZONE_H +#include +#include "qtypes.h" +#include "qdefs.h" + +extern qbool mem_bigendian; + // div0: heap overflow detection paranoia #define MEMPARANOIA 0 @@ -81,7 +87,11 @@ mempool_t; #define Mem_Realloc(pool,data,size) _Mem_Alloc(pool, data, size, 16, __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__) +#if MEMPARANOIA +#define Mem_CheckSentinelsGlobal() _Mem_CheckSentinelsGlobal(__FILE__, __LINE__) +#else +#define Mem_CheckSentinelsGlobal() if(developer_memorydebug.integer) { _Mem_CheckSentinelsGlobal(__FILE__, __LINE__); } +#endif #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__) @@ -94,7 +104,7 @@ 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); +qbool Mem_IsAllocated(mempool_t *pool, void *data); char* Mem_strdup (mempool_t *pool, const char* s); @@ -137,6 +147,7 @@ extern mempool_t *zonemempool; extern struct cvar_s developer_memory; extern struct cvar_s developer_memorydebug; +extern struct cvar_s developer_memoryreportlargerthanmb; #endif