diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-10-05 22:51:25 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-10-05 22:51:25 +0200 |
| commit | f728e9cce060ded8db40b82e02683331252f6cc5 (patch) | |
| tree | 4056336823133331c3d7e64e67feba1db4878ab9 | |
| parent | 6d52a4130789e59b6c8d83e151230180cbd39493 (diff) | |
disable valgrind macro usage for now since valgrind generates a lot of spurious warnings as it seems
| -rw-r--r-- | src/pulsecore/memblock.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c index 400a4e1e..d9e1bf1c 100644 --- a/src/pulsecore/memblock.c +++ b/src/pulsecore/memblock.c @@ -261,9 +261,11 @@ static struct mempool_slot* mempool_allocate_slot(pa_mempool *p) { } } -#ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MALLOCLIKE_BLOCK(slot, p->block_size, 0, 0); -#endif +/* #ifdef HAVE_VALGRIND_MEMCHECK_H */ +/* if (PA_UNLIKELY(pa_in_valgrind())) { */ +/* VALGRIND_MALLOCLIKE_BLOCK(slot, p->block_size, 0, 0); */ +/* } */ +/* #endif */ return slot; } @@ -534,16 +536,18 @@ static void memblock_free(pa_memblock *b) { call_free = b->type == PA_MEMBLOCK_POOL_EXTERNAL; +/* #ifdef HAVE_VALGRIND_MEMCHECK_H */ +/* if (PA_UNLIKELY(pa_in_valgrind())) { */ +/* VALGRIND_FREELIKE_BLOCK(slot, b->pool->block_size); */ +/* } */ +/* #endif */ + /* The free list dimensions should easily allow all slots * to fit in, hence try harder if pushing this slot into * the free list fails */ while (pa_flist_push(b->pool->free_slots, slot) < 0) ; -#ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_FREELIKE_BLOCK(slot, b->pool->block_size); -#endif - if (call_free) if (pa_flist_push(PA_STATIC_FLIST_GET(unused_memblocks), b) < 0) pa_xfree(b); |