From: havoc Date: Sun, 8 May 2005 10:42:09 +0000 (+0000) Subject: PR_Alloc/Free/FreeAll now report filename/fileline of their caller in the Mem_ calls... X-Git-Tag: xonotic-v0.1.0preview~4934 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=b4f6284099815f5390c9f00452d15c309f080626;ds=sidebyside PR_Alloc/Free/FreeAll now report filename/fileline of their caller in the Mem_ calls, for better readability of "memlist all" reports git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5245 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/pr_edict.c b/pr_edict.c index 8b41df06..985fc4db 100644 --- a/pr_edict.c +++ b/pr_edict.c @@ -1690,22 +1690,22 @@ void PR_Shutdown (void) Mem_FreePool(&serverprogs_mempool); } -void *PR_Alloc(size_t buffersize) +void *_PR_Alloc(size_t buffersize, const char *filename, int fileline) { - return Mem_Alloc(serverprogs_mempool, buffersize); + return _Mem_Alloc(serverprogs_mempool, buffersize, filename, fileline); } -void PR_Free(void *buffer) +void _PR_Free(void *buffer, const char *filename, int fileline) { - Mem_Free(buffer); + _Mem_Free(buffer, filename, fileline); } -void PR_FreeAll(void) +void _PR_FreeAll(const char *filename, int fileline) { progs = NULL; pr_fielddefs = NULL; pr_functions = NULL; - Mem_EmptyPool(serverprogs_mempool); + _Mem_EmptyPool(serverprogs_mempool, filename, fileline); } // LordHavoc: turned EDICT_NUM into a #define for speed reasons diff --git a/progs.h b/progs.h index cd692f51..b39f355e 100644 --- a/progs.h +++ b/progs.h @@ -164,9 +164,12 @@ void PR_Shutdown (void); void PR_ExecuteProgram (func_t fnum, const char *errormessage); void PR_LoadProgs (const char *progsname); -void *PR_Alloc (size_t buffersize); -void PR_Free (void *buffer); -void PR_FreeAll (void); +#define PR_Alloc(buffersize) _PR_Alloc(buffersize, __FILE__, __LINE__) +#define PR_Free(buffer) _PR_Free(buffer, __FILE__, __LINE__) +#define PR_FreeAll() _PR_FreeAll(__FILE__, __LINE__) +void *_PR_Alloc (size_t buffersize, const char *filename, int fileline); +void _PR_Free (void *buffer, const char *filename, int fileline); +void _PR_FreeAll (const char *filename, int fileline); void PR_Profile_f (void);