mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-01-02 11:08:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Client API: Add pa_stream_write_ext_free() function.

Browse source 
New function allows to pass data pointer that is a member
of the outer structure that need to be freed too when data
is not needed anymore.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek 2014-04-15 02:08:23 +02:00 • committed by David Henningsson
parent 594da41d07
commit 78ca8cfc96
5 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pulsecore/memblock.c
View file

@ -83,6 +83,8 @@ struct pa_memblock {
struct {
/* If type == PA_MEMBLOCK_USER this points to a function for freeing this memory block */
pa_free_cb_t free_cb;
/* If type == PA_MEMBLOCK_USER this is passed as free_cb argument */
void *free_cb_data;
} user;
struct {
@ -402,7 +404,13 @@ pa_memblock *pa_memblock_new_fixed(pa_mempool *p, void *d, size_t length, bool r
}
/* No lock necessary */
pa_memblock *pa_memblock_new_user(pa_mempool *p, void *d, size_t length, pa_free_cb_t free_cb, bool read_only) {
pa_memblock *pa_memblock_new_user(
pa_mempool *p,
void *d,
size_t length,
pa_free_cb_t free_cb,
void *free_cb_data,
bool read_only) {
pa_memblock *b;
pa_assert(p);
@ -425,6 +433,7 @@ pa_memblock *pa_memblock_new_user(pa_mempool *p, void *d, size_t length, pa_free
pa_atomic_store(&b->please_signal, 0);
b->per_type.user.free_cb = free_cb;
b->per_type.user.free_cb_data = free_cb_data;
stat_add(b);
return b;
@ -536,7 +545,7 @@ static void memblock_free(pa_memblock *b) {
switch (b->type) {
case PA_MEMBLOCK_USER :
pa_assert(b->per_type.user.free_cb);
b->per_type.user.free_cb(pa_atomic_ptr_load(&b->data));
b->per_type.user.free_cb(b->per_type.user.free_cb_data);
/* Fall through */
@ -670,6 +679,7 @@ static void memblock_make_local(pa_memblock *b) {
/* Humm, not enough space in the pool, so lets allocate the memory with malloc() */
b->per_type.user.free_cb = pa_xfree;
pa_atomic_ptr_store(&b->data, pa_xmemdup(pa_atomic_ptr_load(&b->data), b->length));
b->per_type.user.free_cb_data = pa_atomic_ptr_load(&b->data);
b->type = PA_MEMBLOCK_USER;
b->read_only = false;

4
src/pulsecore/memblock.h
View file

@ -85,10 +85,10 @@ pa_memblock *pa_memblock_new(pa_mempool *, size_t length);
pa_memblock *pa_memblock_new_pool(pa_mempool *, size_t length);
/* Allocate a new memory block of type PA_MEMBLOCK_USER */
pa_memblock *pa_memblock_new_user(pa_mempool *, void *data, size_t length, pa_free_cb_t free_cb, bool read_only);
pa_memblock *pa_memblock_new_user(pa_mempool *, void *data, size_t length, pa_free_cb_t free_cb, void *free_cb_data, bool read_only);
/* A special case of pa_memblock_new_user: take a memory buffer previously allocated with pa_xmalloc() */
#define pa_memblock_new_malloced(p,data,length) pa_memblock_new_user(p, data, length, pa_xfree, 0)
#define pa_memblock_new_malloced(p,data,length) pa_memblock_new_user(p, data, length, pa_xfree, data, 0)
/* Allocate a new memory block of type PA_MEMBLOCK_FIXED */
pa_memblock *pa_memblock_new_fixed(pa_mempool *, void *data, size_t length, bool read_only);