mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

memblock: try to hit an assert earlier when ref counting doesn't work

Browse source
This commit is contained in:
Lennart Poettering 2009-07-24 15:49:22 +02:00
parent 2bbdf631f8
commit 5e24b6dff5
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/pulsecore/memblock.c
View file

@ -96,6 +96,7 @@ struct pa_memimport_segment {
unsigned n_blocks; unsigned n_blocks;
}; };
/* A collection of multiple segments */
struct pa_memimport { struct pa_memimport {
pa_mutex *mutex; pa_mutex *mutex;
@ -514,9 +515,9 @@ static void memblock_free(pa_memblock *b) {
pa_mutex_lock(import->mutex); pa_mutex_lock(import->mutex);
pa_hashmap_remove( pa_assert_se(pa_hashmap_remove(
import->blocks, import->blocks,
PA_UINT32_TO_PTR(b->per_type.imported.id)); PA_UINT32_TO_PTR(b->per_type.imported.id)));
pa_assert(segment->n_blocks >= 1); pa_assert(segment->n_blocks >= 1);
if (-- segment->n_blocks <= 0) if (-- segment->n_blocks <= 0)
@ -677,9 +678,9 @@ static void memblock_replace_import(pa_memblock *b) {
pa_mutex_lock(import->mutex); pa_mutex_lock(import->mutex);
pa_hashmap_remove( pa_assert_se(pa_hashmap_remove(
import->blocks, import->blocks,
PA_UINT32_TO_PTR(b->per_type.imported.id)); PA_UINT32_TO_PTR(b->per_type.imported.id)));
memblock_make_local(b); memblock_make_local(b);
@ -960,6 +961,11 @@ pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_i
pa_mutex_lock(i->mutex); pa_mutex_lock(i->mutex);
if ((b = pa_hashmap_get(i->blocks, PA_UINT32_TO_PTR(block_id)))) {
pa_memblock_ref(b);
goto finish;
}
if (pa_hashmap_size(i->blocks) >= PA_MEMIMPORT_SLOTS_MAX) if (pa_hashmap_size(i->blocks) >= PA_MEMIMPORT_SLOTS_MAX)
goto finish; goto finish;
@ -989,12 +995,11 @@ pa_memblock* pa_memimport_get(pa_memimport *i, uint32_t block_id, uint32_t shm_i
seg->n_blocks++; seg->n_blocks++;
stat_add(b);
finish: finish:
pa_mutex_unlock(i->mutex); pa_mutex_unlock(i->mutex);
if (b)
stat_add(b);
return b; return b;
} }