From 1bc98da70b7b4a64f1c44639f92fbbbf8cbb858e Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Fri, 16 Feb 2018 20:32:43 +0000 Subject: [PATCH] Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX) --- src/st_stuff.c | 2 +- src/z_zone.c | 2 +- src/z_zone.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 437b6758a..887925666 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -606,7 +606,7 @@ static void ST_drawDebugInfo(void) if (cv_debug & DBG_MEMORY) { - V_DrawRightAlignedString(320, height, V_MONOSPACE, va("Heap: %7sKB", sizeu1(Z_TagsUsage(0, INT32_MAX)>>10))); + V_DrawRightAlignedString(320, height, V_MONOSPACE, va("Heap: %7sKB", sizeu1(Z_TotalUsage()>>10))); } } diff --git a/src/z_zone.c b/src/z_zone.c index 2c7cf7c71..b5799b583 100644 --- a/src/z_zone.c +++ b/src/z_zone.c @@ -758,7 +758,7 @@ static void Command_Memfree_f(void) Z_CheckHeap(-1); CONS_Printf("\x82%s", M_GetText("Memory Info\n")); - CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1(Z_TagsUsage(0, INT32_MAX)>>10)); + CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1(Z_TotalUsage()>>10)); CONS_Printf(M_GetText("Static : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10)); CONS_Printf(M_GetText("Static (sound) : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10)); CONS_Printf(M_GetText("Static (music) : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10)); diff --git a/src/z_zone.h b/src/z_zone.h index d74639be9..205c9ed79 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -133,6 +133,7 @@ void Z_SetUser(void *ptr, void **newuser); // #define Z_TagUsage(tagnum) Z_TagsUsage(tagnum, tagnum) size_t Z_TagsUsage(INT32 lowtag, INT32 hightag); +#define Z_TotalUsage() Z_TagsUsage(0, INT32_MAX) // // Miscellaneous functions