summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-18 19:56:11 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-18 19:56:11 +0000
commitc3fc2eaa7e44c1d71f53e4f61c874f551a65de3e (patch)
treea5ad31c86c062805be877a403cb56d3a0178149b /src/tests
parent0e436a6926af56f37a74a03bb5e143e078ca0d55 (diff)
update tests for new memory manager
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1267 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/mcalign-test.c11
-rw-r--r--src/tests/memblockq-test.c16
2 files changed, 19 insertions, 8 deletions
diff --git a/src/tests/mcalign-test.c b/src/tests/mcalign-test.c
index 7a68e6de..35691698 100644
--- a/src/tests/mcalign-test.c
+++ b/src/tests/mcalign-test.c
@@ -38,9 +38,14 @@
/* 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);
+ pa_mempool *p;
+ pa_mcalign *a;
pa_memchunk c;
+ p = pa_mempool_new(0);
+
+ a = pa_mcalign_new(11);
+
pa_memchunk_reset(&c);
srand(time(NULL));
@@ -50,7 +55,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
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;
}
@@ -94,5 +99,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;
}
diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index af43d06f..1ac4577b 100644
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -32,34 +32,38 @@
int main(int argc, char *argv[]) {
int ret;
+
+ pa_mempool *p;
pa_memblockq *bq;
pa_memchunk chunk1, chunk2, chunk3, chunk4;
pa_memblock *silence;
pa_log_set_maximal_level(PA_LOG_DEBUG);
+
+ p = pa_mempool_new(0);
- silence = pa_memblock_new_fixed((char*) "__", 2, 1, NULL);
+ silence = pa_memblock_new_fixed(p, (char*) "__", 2, 1);
assert(silence);
- bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence, NULL);
+ bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence);
assert(bq);
- chunk1.memblock = pa_memblock_new_fixed((char*) "AA", 2, 1, NULL);
+ chunk1.memblock = pa_memblock_new_fixed(p, (char*) "AA", 2, 1);
chunk1.index = 0;
chunk1.length = 2;
assert(chunk1.memblock);
- chunk2.memblock = pa_memblock_new_fixed((char*) "TTBB", 4, 1, NULL);
+ chunk2.memblock = pa_memblock_new_fixed(p, (char*) "TTBB", 4, 1);
chunk2.index = 2;
chunk2.length = 2;
assert(chunk2.memblock);
- chunk3.memblock = pa_memblock_new_fixed((char*) "ZZZZ", 4, 1, NULL);
+ chunk3.memblock = pa_memblock_new_fixed(p, (char*) "ZZZZ", 4, 1);
chunk3.index = 0;
chunk3.length = 4;
assert(chunk3.memblock);
- chunk4.memblock = pa_memblock_new_fixed((char*) "KKKKKKKK", 8, 1, NULL);
+ chunk4.memblock = pa_memblock_new_fixed(p, (char*) "KKKKKKKK", 8, 1);
chunk4.index = 0;
chunk4.length = 8;
assert(chunk4.memblock);