summaryrefslogtreecommitdiffstats
path: root/src/modules/module-pipe-sink.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-09-26 23:50:56 +0000
committerLennart Poettering <lennart@poettering.net>2006-09-26 23:50:56 +0000
commitd210ebbb09daddb2c8c8e8e77243e088b0b19c4d (patch)
tree6ca5cc7add195f5a59778df4b0ff44f2881a0c12 /src/modules/module-pipe-sink.c
parent5ad143b3aba3e5bd0d528feb3143dd9cd2f1e845 (diff)
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
Diffstat (limited to 'src/modules/module-pipe-sink.c')
-rw-r--r--src/modules/module-pipe-sink.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 4aee849b..59d91aa4 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -84,6 +84,8 @@ static const char* const valid_modargs[] = {
static void do_write(struct userdata *u) {
ssize_t r;
+ void *p;
+
assert(u);
u->core->mainloop->defer_enable(u->defer_event, 0);
@@ -97,12 +99,17 @@ static void do_write(struct userdata *u) {
if (pa_sink_render(u->sink, PIPE_BUF, &u->memchunk) < 0)
return;
- assert(u->memchunk.memblock && u->memchunk.length);
+ assert(u->memchunk.memblock);
+ assert(u->memchunk.length);
+
+ p = pa_memblock_acquire(u->memchunk.memblock);
- if ((r = pa_iochannel_write(u->io, (uint8_t*) u->memchunk.memblock->data + u->memchunk.index, u->memchunk.length)) < 0) {
+ if ((r = pa_iochannel_write(u->io, (uint8_t*) p + u->memchunk.index, u->memchunk.length)) < 0) {
+ pa_memblock_release(u->memchunk.memblock);
pa_log("write(): %s", pa_cstrerror(errno));
return;
}
+ pa_memblock_release(u->memchunk.memblock);
u->memchunk.index += r;
u->memchunk.length -= r;