Merge HUGE set of changes temporarily into a branch, to allow me to move them from one machine to another (lock-free and stuff)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1469 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 16 insertions, 6 deletions

diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index 9d4d0eac..9061e110 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -158,6 +158,7 @@ static void do_write(struct userdata *u) {
     }
 
     do {
+        void *p;
         memchunk = &u->memchunk;
 
         if (!memchunk->length)
@@ -165,10 +166,11 @@ static void do_write(struct userdata *u) {
                 memchunk = &u->silence;
 
         assert(memchunk->memblock);
-        assert(memchunk->memblock->data);
         assert(memchunk->length);
 
-        if ((r = pa_iochannel_write(u->io, (uint8_t*) memchunk->memblock->data + memchunk->index, memchunk->length)) < 0) {
+        p = pa_memblock_acquire(memchunk->memblock);
+        if ((r = pa_iochannel_write(u->io, (uint8_t*) p + memchunk->index, memchunk->length)) < 0) {
+            pa_memblock_release(memchunk->memblock);
 
             if (errno != EAGAIN) {
                 pa_log("write() failed: %s", pa_cstrerror(errno));
@@ -180,6 +182,8 @@ static void do_write(struct userdata *u) {
             break;
         }
 
+        pa_memblock_release(memchunk->memblock);
+
         if (memchunk == &u->silence)
             assert(r % u->sample_size == 0);
         else {
@@ -224,9 +228,13 @@ static void do_read(struct userdata *u) {
     }
 
     do {
+        void *p;
         memchunk.memblock = pa_memblock_new(u->core->mempool, l);
-        assert(memchunk.memblock);
-        if ((r = pa_iochannel_read(u->io, memchunk.memblock->data, memchunk.memblock->length)) < 0) {
+
+        p = pa_memblock_acquire(memchunk.memblock);
+
+        if ((r = pa_iochannel_read(u->io, p, pa_memblock_get_length(memchunk.memblock))) < 0) {
+            pa_memblock_release(memchunk.memblock);
             pa_memblock_unref(memchunk.memblock);
 
             if (errno != EAGAIN) {
@@ -239,8 +247,10 @@ static void do_read(struct userdata *u) {
             break;
         }
 
-        assert(r <= (ssize_t) memchunk.memblock->length);
-        memchunk.length = memchunk.memblock->length = r;
+        pa_memblock_release(memchunk.memblock);
+
+        assert(r <= (ssize_t) pa_memblock_get_length(memchunk.memblock));
+        memchunk.length = r;
         memchunk.index = 0;
 
         pa_source_post(u->source, &memchunk);