From 9d9930084151e874bdbda3bdd2ea8b921b5e3e3e Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Wed, 12 May 2010 00:46:39 +0200 Subject: [PATCH] FIX: #619, New Nobug required! version 201005.1 add the 'extra' argument to mpool dumps. Solves Linking problems on some distros. --- configure.ac | 2 +- src/lib/mpool.c | 5 ++++- src/lib/mpool.h | 3 ++- tests/library/test-mpool.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 16d89f628..6cc50ce0b 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H)) PKG_CHECK_MODULES(VALGRIND, [valgrind], AC_DEFINE(HAVE_VALGRIND_H), AC_MSG_NOTICE([valgrind not found (optional)])) -PKG_CHECK_MODULES(NOBUGMT, [nobugmt >= 201002.1], +PKG_CHECK_MODULES(NOBUGMT, [nobugmt >= 201005.1], AC_DEFINE(HAVE_NOBUGMT_H), AC_MSG_ERROR([Missing required nobug version (http://www.lumiera.org/nobug_manual.html)]) ) diff --git a/src/lib/mpool.c b/src/lib/mpool.c index 1c77aadcd..b713006c8 100644 --- a/src/lib/mpool.c +++ b/src/lib/mpool.c @@ -504,8 +504,11 @@ mpool_reserve (MPool self, unsigned nelements) void nobug_mpool_dump (const_MPool self, const int depth, - const struct nobug_context dump_context) + const struct nobug_context dump_context, + void* extra) { + (void) extra; + if (self && depth) { DUMP_LOG ("mpool %p: ", self); diff --git a/src/lib/mpool.h b/src/lib/mpool.h index 3cc9f4953..f2384bf94 100644 --- a/src/lib/mpool.h +++ b/src/lib/mpool.h @@ -257,7 +257,8 @@ mpool_free (MPool self, void* element); void nobug_mpool_dump (const_MPool self, const int depth, - const struct nobug_context dump_context); + const struct nobug_context dump_context, + void* extra); /* diff --git a/tests/library/test-mpool.c b/tests/library/test-mpool.c index 8e3bcd8a4..d07a58b78 100644 --- a/tests/library/test-mpool.c +++ b/tests/library/test-mpool.c @@ -56,12 +56,12 @@ TEST ("basic") ECHO ("allocated %p", element); *(int*)element = 0xdeadbabe; - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_free (&mypool, element); ECHO ("freed"); - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed"); @@ -79,7 +79,7 @@ TEST ("destroy") ECHO ("allocated %p", element); *(int*)element = 0xbabeface; - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed"); @@ -100,7 +100,7 @@ TEST ("clusters") *(int*)element = i; } - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed"); @@ -121,7 +121,7 @@ TEST ("clusters_big") *(int*)element = i; } - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed"); @@ -148,7 +148,7 @@ TEST ("alloc_free") mpool_free (&mypool, elem[i]); } ECHO ("freed some"); - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed"); @@ -175,9 +175,9 @@ TEST ("alloc_free_big") mpool_free (&mypool, elem[i]); } ECHO ("freed some"); - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); - DUMP(NOBUG_ON, mpool, &mypool, 4); + DUMP(NOBUG_ON, mpool, &mypool, 4, NULL); mpool_destroy (&mypool); ECHO ("destroyed");