Skip to content

Commit

Permalink
Annotate PoolMalloc memory in valgrind builds (#1946)
Browse files Browse the repository at this point in the history
MemPoolMalloc code (i.e. memory_pools code used by default) was missing
VALGRIND_MAKE_MEM_*() calls. Similar calls do exist in MemPoolChunked
code (i.e. code enabled by setting MEMPOOLS environment variable to 1).

Even with these markings, "memory_pools on" configuration is still not
quite compatible with Valgrind leak reporting suppressions: In some
cases, Valgrind may still incorrectly suppress leak reporting (or report
leaks that should have been suppressed) because Valgrind associates leak
suppressions with memory _allocators_ while buggy code may leak memory
allocated by others. The long-term solution (if it exists) requires
upgrading these markings to VALGRIND_MEMPOOL_*() API targeting memory
pools, but that requires a serious effort, especially when dealing with
MemPoolChunked complexities. The added markings help detect non-leak
violations and improve PoolMalloc/MemPoolChunked code symmetry.
  • Loading branch information
rousskov authored and squid-anubis committed Nov 13, 2024
1 parent 187bb5d commit aacc917
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/mem/PoolMalloc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ MemPoolMalloc::allocate()
if (obj) {
--meter.idle;
++countSavedAllocs;
if (doZero)
(void)VALGRIND_MAKE_MEM_DEFINED(obj, objectSize);
else
(void)VALGRIND_MAKE_MEM_UNDEFINED(obj, objectSize);
} else {
if (doZero)
obj = xcalloc(1, objectSize);
Expand All @@ -52,6 +56,7 @@ MemPoolMalloc::deallocate(void *obj)
} else {
if (doZero)
memset(obj, 0, objectSize);
(void)VALGRIND_MAKE_MEM_NOACCESS(obj, objectSize);
++meter.idle;
freelist.push(obj);
}
Expand Down

0 comments on commit aacc917

Please sign in to comment.