ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX: #619, New Nobug required! version 201005.1

Browse source 
add the 'extra' argument to mpool dumps.
Solves Linking problems on some distros.
This commit is contained in:
Christian Thaeter 2010-05-12 00:46:39 +02:00
parent 5792d330b3
commit 9d99300841
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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)])
)

5
src/lib/mpool.c
View file

@ -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);

3
src/lib/mpool.h
View file

@ -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);
/*

16
tests/library/test-mpool.c
View file

@ -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");