pulsecore: Transform pa_mempool_new() into a factory method

Soon we're going to have three types of memory pools: POSIX shm_open()
pools, memfd memfd_create() ones, and privately malloc()-ed pools.

Thus introduce annotations for the memory types supported and change
pa_mempool_new() into a factory method based on required memory.

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
This commit is contained in:
Ahmed S. Darwish 2016-03-13 00:57:06 +02:00 committed by David Henningsson
parent 211a520543
commit b88acd0266
18 changed files with 97 additions and 37 deletions

View file

@ -76,7 +76,7 @@ static void run_mix_test(
samples_ref = out_ref + (8 - align);
nsamples = channels * (SAMPLES - (8 - align));
fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
fail_unless((pool = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0)) != NULL, NULL);
pa_random(samples0, nsamples * sizeof(int16_t));
c0.memblock = pa_memblock_new_fixed(pool, samples0, nsamples * sizeof(int16_t), false);

View file

@ -136,7 +136,7 @@ START_TEST (lfe_filter_test) {
a.format = PA_SAMPLE_S16NE;
lft.ss = &a;
pa_assert_se(lft.pool = pa_mempool_new(false, 0));
pa_assert_se(lft.pool = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0));
/* We prepare pseudo-random input audio samples for lfe-filter rewind testing*/
ori_sample_ptr = pa_xmalloc(pa_frame_size(lft.ss) * TOTAL_SAMPLES);

View file

@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
pa_mcalign *a;
pa_memchunk c;
p = pa_mempool_new(false, 0);
p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0);
a = pa_mcalign_new(11);

View file

@ -80,11 +80,11 @@ START_TEST (memblock_test) {
const char txt[] = "This is a test!";
pool_a = pa_mempool_new(true, 0);
pool_a = pa_mempool_new(PA_MEM_TYPE_SHARED_POSIX, 0);
fail_unless(pool_a != NULL);
pool_b = pa_mempool_new(true, 0);
pool_b = pa_mempool_new(PA_MEM_TYPE_SHARED_POSIX, 0);
fail_unless(pool_b != NULL);
pool_c = pa_mempool_new(true, 0);
pool_c = pa_mempool_new(PA_MEM_TYPE_SHARED_POSIX, 0);
fail_unless(pool_c != NULL);
pa_mempool_get_shm_id(pool_a, &id_a);

View file

@ -108,7 +108,7 @@ START_TEST (memblockq_test) {
pa_log_set_level(PA_LOG_DEBUG);
p = pa_mempool_new(false, 0);
p = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0);
silence.memblock = pa_memblock_new_fixed(p, (char*) "__", 2, 1);
fail_unless(silence.memblock != NULL);

View file

@ -286,7 +286,7 @@ START_TEST (mix_test) {
if (!getenv("MAKE_CHECK"))
pa_log_set_level(PA_LOG_DEBUG);
fail_unless((pool = pa_mempool_new(false, 0)) != NULL, NULL);
fail_unless((pool = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0)) != NULL, NULL);
a.channels = 1;
a.rate = 44100;

View file

@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
pa_log_set_level(PA_LOG_DEBUG);
pa_assert_se(pool = pa_mempool_new(false, 0));
pa_assert_se(pool = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0));
for (i = 0; maps[i].channels > 0; i++)
for (j = 0; maps[j].channels > 0; j++) {

View file

@ -404,7 +404,7 @@ int main(int argc, char *argv[]) {
}
ret = 0;
pa_assert_se(pool = pa_mempool_new(false, 0));
pa_assert_se(pool = pa_mempool_new(PA_MEM_TYPE_PRIVATE, 0));
if (!all_formats) {

View file

@ -85,7 +85,7 @@ START_TEST (srbchannel_test) {
int pipefd[4];
pa_mainloop *ml = pa_mainloop_new();
pa_mempool *mp = pa_mempool_new(true, 0);
pa_mempool *mp = pa_mempool_new(PA_MEM_TYPE_SHARED_POSIX, 0);
pa_iochannel *io1, *io2;
pa_pstream *p1, *p2;
pa_srbchannel *sr1, *sr2;