From bc17b8ea2d772e5069fbef4dde24ef9c63f1cfa1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 26 Jul 2007 13:20:11 +0000 Subject: [PATCH] reverse order flist destruction and mempool allocation warning git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1543 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/pulsecore/memblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c index c39147d..f3e400e 100644 --- a/src/pulsecore/memblock.c +++ b/src/pulsecore/memblock.c @@ -669,12 +669,13 @@ void pa_mempool_free(pa_mempool *p) { pa_mutex_unlock(p->mutex); + pa_flist_free(p->free_slots, NULL); + if (pa_atomic_load(&p->stat.n_allocated) > 0) { /* raise(SIGTRAP); */ pa_log_warn("WARNING! Memory pool destroyed but not all memory blocks freed! %u remain.", pa_atomic_load(&p->stat.n_allocated)); } - pa_flist_free(p->free_slots, NULL); pa_shm_free(&p->memory); pa_mutex_free(p->mutex); -- 2.7.4