mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-02 09:01:46 -05:00
rework memory block management to be thread-safe and mostly lock-free.
pa_memblock is now an opaque structure. Access to its fields is now done through various accessor functions in a thread-safe manner. pa_memblock_acquire() and pa_memblock_release() are now used to access the attached audio data. Why? To allow safe manipulation of the memory pointer maintained by the memory block. Internally _acquire() and _release() maintain a reference counter. Please do not confuse this reference counter whith the one maintained by pa_memblock_ref()/_unref()! As a side effect this patch removes all direct usages of AO_t and replaces it with pa_atomic_xxx based code. This stuff needs some serious testing love. Especially if threads are actively used. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1404 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
5ad143b3ab
commit
d210ebbb09
36 changed files with 991 additions and 500 deletions
|
|
@ -76,6 +76,7 @@ int main(int argc, char *argv[]) {
|
|||
pa_memblock* blocks[5];
|
||||
uint32_t id, shm_id;
|
||||
size_t offset, size;
|
||||
char *x;
|
||||
|
||||
const char txt[] = "This is a test!";
|
||||
|
||||
|
|
@ -90,10 +91,17 @@ int main(int argc, char *argv[]) {
|
|||
assert(pool_a && pool_b && pool_c);
|
||||
|
||||
blocks[0] = pa_memblock_new_fixed(pool_a, (void*) txt, sizeof(txt), 1);
|
||||
|
||||
blocks[1] = pa_memblock_new(pool_a, sizeof(txt));
|
||||
snprintf(blocks[1]->data, blocks[1]->length, "%s", txt);
|
||||
x = pa_memblock_acquire(blocks[1]);
|
||||
snprintf(x, pa_memblock_get_length(blocks[1]), "%s", txt);
|
||||
pa_memblock_release(blocks[1]);
|
||||
|
||||
blocks[2] = pa_memblock_new_pool(pool_a, sizeof(txt));
|
||||
snprintf(blocks[2]->data, blocks[2]->length, "%s", txt);
|
||||
x = pa_memblock_acquire(blocks[2]);
|
||||
snprintf(x, pa_memblock_get_length(blocks[2]), "%s", txt);
|
||||
pa_memblock_release(blocks[1]);
|
||||
|
||||
blocks[3] = pa_memblock_new_malloced(pool_a, pa_xstrdup(txt), sizeof(txt));
|
||||
blocks[4] = NULL;
|
||||
|
||||
|
|
@ -130,14 +138,18 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
mb_c = pa_memimport_get(import_c, id, shm_id, offset, size);
|
||||
assert(mb_c);
|
||||
printf("1 data=%s\n", (char*) mb_c->data);
|
||||
x = pa_memblock_acquire(mb_c);
|
||||
printf("1 data=%s\n", x);
|
||||
pa_memblock_release(mb_c);
|
||||
|
||||
print_stats(pool_a, "A");
|
||||
print_stats(pool_b, "B");
|
||||
print_stats(pool_c, "C");
|
||||
|
||||
pa_memexport_free(export_b);
|
||||
printf("2 data=%s\n", (char*) mb_c->data);
|
||||
x = pa_memblock_acquire(mb_c);
|
||||
printf("2 data=%s\n", x);
|
||||
pa_memblock_release(mb_c);
|
||||
pa_memblock_unref(mb_c);
|
||||
|
||||
pa_memimport_free(import_b);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue