X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/3cb8e0191c9e79a4d39f788b42449d12032b462c..33a88fbfdee773b1473cb5339540d79809363bdc:/src/pulsecore/memblock.c diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c index f38b17c6..bc804577 100644 --- a/src/pulsecore/memblock.c +++ b/src/pulsecore/memblock.c @@ -82,7 +82,7 @@ struct pa_memblock { pa_free_cb_t free_cb; } user; - struct { + struct { uint32_t id; pa_memimport_segment *segment; } imported; @@ -258,7 +258,7 @@ static struct mempool_slot* mempool_allocate_slot(pa_mempool *p) { slot = (struct mempool_slot*) ((uint8_t*) p->memory.ptr + (p->block_size * (size_t) idx)); if (!slot) { - if (pa_log_ratelimit()) + if (pa_log_ratelimit(PA_LOG_DEBUG)) pa_log_debug("Pool full"); pa_atomic_inc(&p->stat.n_pool_full); return NULL; @@ -531,9 +531,7 @@ static void memblock_free(pa_memblock *b) { pa_mutex_lock(import->mutex); - pa_assert_se(pa_hashmap_remove( - import->blocks, - PA_UINT32_TO_PTR(b->per_type.imported.id))); + pa_assert_se(pa_hashmap_remove(import->blocks, PA_UINT32_TO_PTR(b->per_type.imported.id))); pa_assert(segment->n_blocks >= 1); if (-- segment->n_blocks <= 0) @@ -693,9 +691,7 @@ static void memblock_replace_import(pa_memblock *b) { pa_mutex_lock(import->mutex); - pa_assert_se(pa_hashmap_remove( - import->blocks, - PA_UINT32_TO_PTR(b->per_type.imported.id))); + pa_assert_se(pa_hashmap_remove(import->blocks, PA_UINT32_TO_PTR(b->per_type.imported.id))); memblock_make_local(b);