Make the shared memory segment size configurable

[pulseaudio] / src / tests / mcalign-test.c

diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 2728def2267fd69959a1a82a54026907a824da98..92e3e14e32b86d8bae95b096ecbd97dee44d17cb 100644 (file)
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -1,20 +1,18 @@
-/* $Id$ */
-
 /***
-  This file is part of polypaudio.
- 
-  polypaudio is free software; you can redistribute it and/or modify
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
-  polypaudio is distributed in the hope that it will be useful, but
+
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   Lesser General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
-  License along with polypaudio; if not, write to the Free Software
+  License along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -31,47 +29,58 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <polypcore/util.h>
-#include <polypcore/mcalign.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/gccmacro.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/mcalign.h>
 
 /* A simple program for testing pa_mcalign */
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
-    pa_mcalign *a = pa_mcalign_new(11, NULL);
+int main(int argc, char *argv[]) {
+    pa_mempool *p;
+    pa_mcalign *a;
     pa_memchunk c;
 
+    p = pa_mempool_new(FALSE, 0);
+
+    a = pa_mcalign_new(11);
+
     pa_memchunk_reset(&c);
 
-    srand(time(NULL));
+    srand((unsigned) time(NULL));
 
     for (;;) {
         ssize_t r;
         size_t l;
 
         if (!c.memblock) {
-            c.memblock = pa_memblock_new(2048, NULL);
+            c.memblock = pa_memblock_new(p, 2048);
             c.index = c.length = 0;
         }
 
-        assert(c.index < c.memblock->length);
+        assert(c.index < pa_memblock_get_length(c.memblock));
+
+        l = pa_memblock_get_length(c.memblock) - c.index;
+
+        l = l <= 1 ? l : (size_t) rand() % (l-1) +1;
 
-        l = c.memblock->length - c.index;
+        p = pa_memblock_acquire(c.memblock);
 
-        l = l <= 1 ? l : rand() % (l-1) +1 ;
-        
-        if ((r = read(STDIN_FILENO, (uint8_t*) c.memblock->data + c.index, l)) <= 0) {
+        if ((r = read(STDIN_FILENO, (uint8_t*) p + c.index, l)) <= 0) {
+            pa_memblock_release(c.memblock);
             fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
             break;
         }
 
-        c.length = r;
+        pa_memblock_release(c.memblock);
+
+        c.length = (size_t) r;
         pa_mcalign_push(a, &c);
         fprintf(stderr, "Read %ld bytes\n", (long)r);
 
-        c.index += r;
+        c.index += (size_t) r;
 
-        if (c.index >= c.memblock->length) {
+        if (c.index >= pa_memblock_get_length(c.memblock)) {
             pa_memblock_unref(c.memblock);
             pa_memchunk_reset(&c);
         }
@@ -82,7 +91,9 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
             if (pa_mcalign_pop(a, &t) < 0)
                 break;
 
-            pa_loop_write(STDOUT_FILENO, (uint8_t*) t.memblock->data + t.index, t.length);
+            p = pa_memblock_acquire(t.memblock);
+            pa_loop_write(STDOUT_FILENO, (uint8_t*) p + t.index, t.length, NULL);
+            pa_memblock_release(t.memblock);
             fprintf(stderr, "Wrote %lu bytes.\n", (unsigned long) t.length);
 
             pa_memblock_unref(t.memblock);
@@ -94,5 +105,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     if (c.memblock)
         pa_memblock_unref(c.memblock);
 
+    pa_mempool_free(p);
+
     return 0;
 }