From f2d5c1451946c8a7fc19524480751ad8a76cc1c0 Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Sun, 9 Feb 2025 23:05:11 +0100 Subject: [PATCH] Make Valgrind builds usable when not running with Valgrind + cleanup --- src/z_zone.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/z_zone.cpp b/src/z_zone.cpp index 5bde8d7ba..b77e3d1ea 100644 --- a/src/z_zone.cpp +++ b/src/z_zone.cpp @@ -44,7 +44,6 @@ #ifdef HAVE_VALGRIND #include "valgrind.h" static boolean Z_calloc = false; -#include "memcheck.h" #endif #define ZONEID 0xa441d13d @@ -189,7 +188,7 @@ void Z_Free(void *ptr) if (block->user != NULL) *block->user = NULL; -#ifdef VALGRIND_DESTROY_MEMPOOL +#ifdef HAVE_VALGRIND VALGRIND_DESTROY_MEMPOOL(block); #endif block->prev->next = block->next; @@ -257,10 +256,6 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) ptr = MEMORY(block); I_Assert((intptr_t)ptr % alignof (max_align_t) == 0); -#ifdef HAVE_VALGRIND - Z_calloc = false; -#endif - block->next = headlist[tag].next; block->prev = &headlist[tag]; headlist[tag].next = block; @@ -274,8 +269,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user) #endif block->size = size; -#ifdef VALGRIND_CREATE_MEMPOOL +#ifdef HAVE_VALGRIND VALGRIND_CREATE_MEMPOOL(block, size, Z_calloc); + Z_calloc = false; #endif #ifdef PARANOIA @@ -314,7 +310,7 @@ void *Z_Calloc(size_t size, INT32 tag, void *user) { I_Assert(I_GetCurrentThread() == main_thread); -#ifdef VALGRIND_MEMPOOL_ALLOC +#ifdef HAVE_VALGRIND Z_calloc = true; #endif #ifdef ZDEBUG @@ -558,8 +554,8 @@ void Z_CheckHeap(INT32 tag) CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n", blocknumon, block->ownerfile, block->ownerline); #endif -#ifdef VALGRIND_MEMPOOL_EXISTS - if (!VALGRIND_MEMPOOL_EXISTS(block)) +#ifdef HAVE_VALGRIND + if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block)) { HeapError(" should not exist"); }