diff options
author | Lennart Poettering <lennart@poettering.net> | 2006-08-18 19:55:18 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2006-08-18 19:55:18 +0000 |
commit | 0e436a6926af56f37a74a03bb5e143e078ca0d55 (patch) | |
tree | f837bc433ba8b6f904e6d512f9c9c2552a9827db /src/pulsecore/mcalign.c | |
parent | ff48681aaef919cd2c85e4572928e936397a615c (diff) |
Rework memory management to allow shared memory data transfer. The central idea
is to allocate all audio memory blocks from a per-process memory pool which is
available as read-only SHM segment to other local processes. Then, instead of
writing the actual audio data to the socket just write references to this
shared memory pool.
To work optimally all memory blocks should now be of type PA_MEMBLOCK_POOL or
PA_MEMBLOCK_POOL_EXTERNAL. The function pa_memblock_new() now generates memory
blocks of this type by default.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1266 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/mcalign.c')
-rw-r--r-- | src/pulsecore/mcalign.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/pulsecore/mcalign.c b/src/pulsecore/mcalign.c index 8283a7a0..9ede610d 100644 --- a/src/pulsecore/mcalign.c +++ b/src/pulsecore/mcalign.c @@ -35,10 +35,9 @@ struct pa_mcalign { size_t base; pa_memchunk leftover, current; - pa_memblock_stat *memblock_stat; }; -pa_mcalign *pa_mcalign_new(size_t base, pa_memblock_stat *s) { +pa_mcalign *pa_mcalign_new(size_t base) { pa_mcalign *m; assert(base); @@ -47,7 +46,6 @@ pa_mcalign *pa_mcalign_new(size_t base, pa_memblock_stat *s) { m->base = base; pa_memchunk_reset(&m->leftover); pa_memchunk_reset(&m->current); - m->memblock_stat = s; return m; } @@ -100,7 +98,7 @@ void pa_mcalign_push(pa_mcalign *m, const pa_memchunk *c) { l = c->length; /* Can we use the current block? */ - pa_memchunk_make_writable(&m->leftover, m->memblock_stat, m->base); + pa_memchunk_make_writable(&m->leftover, m->base); memcpy((uint8_t*) m->leftover.memblock->data + m->leftover.index + m->leftover.length, (uint8_t*) c->memblock->data + c->index, l); m->leftover.length += l; |