From 90894998c3de37b6f6b6a3ca10d5687604e7cd2c Mon Sep 17 00:00:00 2001
From: Arne Goedeke <el@laramies.com>
Date: Sun, 16 Jun 2013 21:13:29 +0200
Subject: [PATCH] block_allocator: check for valgrind macros
---
src/block_allocator.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/block_allocator.c b/src/block_allocator.c
index ddc2b5c96e..734bab8de1 100644
--- a/src/block_allocator.c
+++ b/src/block_allocator.c
@@ -43,6 +43,15 @@ struct ba_block_header {
struct ba_block_header * next;
};
+#ifdef HAVE_VALGRIND_MACROS
+# ifndef VALGRIND_CREATE_MEMPOOL
+# define VALGRIND_CREATE_MEMPOOL(a, b, c)
+# define VALGRIND_MEMPOOL_ALLOC(a, p, l) VALGRIND_MAKE_MEM_UNDEFINED((p), (l))
+# define VALGRIND_MEMPOOL_FREE(a, p) VALGRIND_MAKE_MEM_NOACCESS((p), (a)->l.block_size)
+# endif
+#endif
+
+
static struct ba_page * ba_alloc_page(struct block_allocator * a, int i) {
struct ba_layout l = ba_get_layout(a, i);
size_t n = l.offset + l.block_size + sizeof(struct ba_page);
@@ -127,11 +136,6 @@ static void ba_low_alloc(struct block_allocator * a) {
}
}
-#ifndef VALGRIND_MEMPOOL_ALLOC
-# define VALGRIND_MEMPOOL_ALLOC(a, p, l) VALGRIND_MAKE_MEM_UNDEFINED((p), (l))
-# define VALGRIND_MEMPOOL_FREE(a, p) VALGRIND_MAKE_MEM_NOACCESS((p), (a)->l.block_size)
-#endif
-
ATTRIBUTE((malloc))
PMOD_EXPORT void * ba_alloc(struct block_allocator * a) {
struct ba_page * p = a->pages[a->alloc];
--
GitLab