From 8dc62142765249addf131b058c27f931ede1776b Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 6 Nov 2006 13:06:01 +0000
Subject: Revert r1404 and keep it on a development branch until it is fully
 tested.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1409 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/tests/flist-test.c     |  2 +-
 src/tests/mcalign-test.c   | 19 +++++++------------
 src/tests/memblock-test.c  | 20 ++++----------------
 src/tests/memblockq-test.c |  4 +---
 4 files changed, 13 insertions(+), 32 deletions(-)

(limited to 'src/tests')

diff --git a/src/tests/flist-test.c b/src/tests/flist-test.c
index 06d68311..abc0659d 100644
--- a/src/tests/flist-test.c
+++ b/src/tests/flist-test.c
@@ -54,7 +54,7 @@ static void thread_func(void *data) {
     int b = 1;
 
     while (!quit) {
-        char *text;
+        char *text, *t;
 
         /* Allocate some memory, if possible take it from the flist */
         if (b && (text = pa_flist_pop(flist)))
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 1584256c..35691698 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -59,27 +59,24 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
             c.index = c.length = 0;
         }
 
-        assert(c.index < pa_memblock_get_length(c.memblock));
+        assert(c.index < c.memblock->length);
 
-        l = pa_memblock_get_length(c.memblock) - c.index;
+        l = c.memblock->length - c.index;
 
         l = l <= 1 ? l : rand() % (l-1) +1 ;
-
-        p = pa_memblock_acquire(c.memblock);
-        if ((r = read(STDIN_FILENO, (uint8_t*) p + c.index, l)) <= 0) {
-            pa_memblock_release(c.memblock);
+        
+        if ((r = read(STDIN_FILENO, (uint8_t*) c.memblock->data + c.index, l)) <= 0) {
             fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
             break;
         }
-        pa_memblock_release(c.memblock);
-            
+
         c.length = r;
         pa_mcalign_push(a, &c);
         fprintf(stderr, "Read %ld bytes\n", (long)r);
 
         c.index += r;
 
-        if (c.index >= pa_memblock_get_length(c.memblock)) {
+        if (c.index >= c.memblock->length) {
             pa_memblock_unref(c.memblock);
             pa_memchunk_reset(&c);
         }
@@ -90,9 +87,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
             if (pa_mcalign_pop(a, &t) < 0)
                 break;
 
-            p = pa_memblock_acquire(t.memblock);
-            pa_loop_write(STDOUT_FILENO, (uint8_t*) p + t.index, t.length, NULL);
-            pa_memblock_release(t.memblock);
+            pa_loop_write(STDOUT_FILENO, (uint8_t*) t.memblock->data + t.index, t.length, NULL);
             fprintf(stderr, "Wrote %lu bytes.\n", (unsigned long) t.length);
 
             pa_memblock_unref(t.memblock);
diff --git a/src/tests/memblock-test.c b/src/tests/memblock-test.c
index c2dd2efa..ef2e0ad7 100644
--- a/src/tests/memblock-test.c
+++ b/src/tests/memblock-test.c
@@ -76,7 +76,6 @@ 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!";
     
@@ -91,17 +90,10 @@ 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));
-    x = pa_memblock_acquire(blocks[1]);
-    snprintf(x, pa_memblock_get_length(blocks[1]), "%s", txt);
-    pa_memblock_release(blocks[1]);
-    
+    snprintf(blocks[1]->data, blocks[1]->length, "%s", txt);
     blocks[2] = pa_memblock_new_pool(pool_a, sizeof(txt));
-    x = pa_memblock_acquire(blocks[2]);
-    snprintf(x, pa_memblock_get_length(blocks[2]), "%s", txt);
-    pa_memblock_release(blocks[1]);
-
+    snprintf(blocks[2]->data, blocks[2]->length, "%s", txt);
     blocks[3] = pa_memblock_new_malloced(pool_a, pa_xstrdup(txt), sizeof(txt));
     blocks[4] = NULL;
 
@@ -138,18 +130,14 @@ int main(int argc, char *argv[]) {
         
         mb_c = pa_memimport_get(import_c, id, shm_id, offset, size);
         assert(mb_c);
-        x = pa_memblock_acquire(mb_c);
-        printf("1 data=%s\n", x);
-        pa_memblock_release(mb_c);
+        printf("1 data=%s\n", (char*) mb_c->data);
 
         print_stats(pool_a, "A");
         print_stats(pool_b, "B");
         print_stats(pool_c, "C");
         
         pa_memexport_free(export_b);
-        x = pa_memblock_acquire(mb_c);
-        printf("2 data=%s\n", x);
-        pa_memblock_release(mb_c);
+        printf("2 data=%s\n", (char*) mb_c->data);
         pa_memblock_unref(mb_c);
         
         pa_memimport_free(import_b);
diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index 02848eb2..1ac4577b 100644
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -131,10 +131,8 @@ int main(int argc, char *argv[]) {
         if (pa_memblockq_peek(bq, &out) < 0)
             break;
 
-        p = pa_memblock_acquire(out.memblock);
-        for (e = (char*) p + out.index, n = 0; n < out.length; n++)
+        for (e = (char*) out.memblock->data + out.index, n = 0; n < out.length; n++)
             printf("%c", *e);
-        pa_memblock_release(out.memblock);
 
         pa_memblock_unref(out.memblock);
         pa_memblockq_drop(bq, &out, out.length);
-- 
cgit