mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

support: also protect against recursive invocations

Browse source 
Add an extra private field to the source to store the pollevent of
the current iteration. This changes ABI but it seems an embedded source
is not used outside of our own plugins and the unit test doesn't test
this ABI case.

Whenever a source is removed, we can set the data field of the
pollevent to NULL so that it won't be handled in any iteration anymore.

Avoid dispatching the same event multiple times when doing recursive
iterations.

Add some more unit tests for this.

Fixes #2114
This commit is contained in:
Barnabás Pőcze 2022-02-08 17:21:10 +01:00 • committed by Wim Taymans
parent 9acae229ab
commit bf886ba209
3 changed files with 151 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

136
test/test-loop.c
View file

@ -41,6 +41,7 @@ struct data {
struct pw_main_loop *ml;
struct pw_loop *l;
struct obj *a, *b;
int count;
};
static void on_event(struct spa_source *source)
@ -57,13 +58,13 @@ static void on_event(struct spa_source *source)
pw_main_loop_quit(d->ml);
}
PWTEST(pwtest_loop_destroy2)
{
struct data data;
pw_init(0, NULL);
spa_zero(data);
data.ml = pw_main_loop_new(NULL);
pwtest_ptr_notnull(data.ml);
@ -96,9 +97,138 @@ PWTEST(pwtest_loop_destroy2)
return PWTEST_PASS;
}
PWTEST_SUITE(support)
static void
on_event_recurse1(struct spa_source *source)
{
pwtest_add(pwtest_loop_destroy2, PWTEST_NOARG);
static bool first = true;
struct data *d = source->data;
uint64_t val;
++d->count;
pwtest_int_lt(d->count, 3);
read(source->fd, &val, sizeof(val));
if (first) {
first = false;
pw_loop_enter(d->l);
pw_loop_iterate(d->l, -1);
pw_loop_leave(d->l);
}
pw_main_loop_quit(d->ml);
}
PWTEST(pwtest_loop_recurse1)
{
struct data data;
pw_init(0, NULL);
spa_zero(data);
data.ml = pw_main_loop_new(NULL);
pwtest_ptr_notnull(data.ml);
data.l = pw_main_loop_get_loop(data.ml);
pwtest_ptr_notnull(data.l);
data.a = calloc(1, sizeof(*data.a));
data.b = calloc(1, sizeof(*data.b));
data.a->source.func = on_event_recurse1;
data.a->source.fd = eventfd(0, 0);
data.a->source.mask = SPA_IO_IN;
data.a->source.data = &data;
data.b->source.func = on_event_recurse1;
data.b->source.fd = eventfd(0, 0);
data.b->source.mask = SPA_IO_IN;
data.b->source.data = &data;
pw_loop_add_source(data.l, &data.a->source);
pw_loop_add_source(data.l, &data.b->source);
write(data.a->source.fd, &(uint64_t){1}, sizeof(uint64_t));
write(data.b->source.fd, &(uint64_t){1}, sizeof(uint64_t));
pw_main_loop_run(data.ml);
pw_main_loop_destroy(data.ml);
pw_deinit();
return PWTEST_PASS;
}
static void
on_event_recurse2(struct spa_source *source)
{
static bool first = true;
struct data *d = source->data;
uint64_t val;
++d->count;
pwtest_int_lt(d->count, 3);
read(source->fd, &val, sizeof(val));
if (first) {
first = false;
pw_loop_enter(d->l);
pw_loop_iterate(d->l, -1);
pw_loop_leave(d->l);
} else {
pw_loop_remove_source(d->l, &d->a->source);
pw_loop_remove_source(d->l, &d->b->source);
close(d->a->source.fd);
close(d->b->source.fd);
free(d->a);
free(d->b);
}
pw_main_loop_quit(d->ml);
}
PWTEST(pwtest_loop_recurse2)
{
struct data data;
pw_init(0, NULL);
spa_zero(data);
data.ml = pw_main_loop_new(NULL);
pwtest_ptr_notnull(data.ml);
data.l = pw_main_loop_get_loop(data.ml);
pwtest_ptr_notnull(data.l);
data.a = calloc(1, sizeof(*data.a));
data.b = calloc(1, sizeof(*data.b));
data.a->source.func = on_event_recurse2;
data.a->source.fd = eventfd(0, 0);
data.a->source.mask = SPA_IO_IN;
data.a->source.data = &data;
data.b->source.func = on_event_recurse2;
data.b->source.fd = eventfd(0, 0);
data.b->source.mask = SPA_IO_IN;
data.b->source.data = &data;
pw_loop_add_source(data.l, &data.a->source);
pw_loop_add_source(data.l, &data.b->source);
write(data.a->source.fd, &(uint64_t){1}, sizeof(uint64_t));
write(data.b->source.fd, &(uint64_t){1}, sizeof(uint64_t));
pw_main_loop_run(data.ml);
pw_main_loop_destroy(data.ml);
pw_deinit();
return PWTEST_PASS;
}
PWTEST_SUITE(support)
{
pwtest_add(pwtest_loop_destroy2, PWTEST_NOARG);
pwtest_add(pwtest_loop_recurse1, PWTEST_NOARG);
pwtest_add(pwtest_loop_recurse2, PWTEST_NOARG);
return PWTEST_PASS;
}