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

jack: sync threads by pausing the core

Browse source 
When we clear the port io, pause the core until the invoke call
completed. This way we don't start processing other messages until we
have safely removed the port io.

Normally, when clearing a link on a port, first the mix io will be set
to NULL and then the format will be cleared, which clears the buffers
as well. By delaying the processing of the format clear until the io
is removed from the data thread we avoid taking away the buffer memory
from the processing thread prematurely.

When creating a link, first the format and buffers are configured and
then the io is set, which should be safe in all cases.

See !1915
This commit is contained in:
Wim Taymans 2024-02-21 10:39:12 +01:00
parent 18aeddbe80
commit c58e187590
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pipewire-jack/src/pipewire-jack.c
View file

@ -2760,9 +2760,11 @@ static int
do_memmap_free(struct spa_loop *loop,
bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct pw_memmap *mm = user_data;
struct client *c = user_data;
struct pw_memmap *mm = *((struct pw_memmap **)data);
pw_log_trace("memmap %p free", mm);
pw_memmap_free(mm);
pw_core_set_paused(c->core, false);
return 0;
}
@ -2771,8 +2773,7 @@ do_queue_memmap_free(struct spa_loop *loop,
bool async, uint32_t seq, const void *data, size_t size, void *user_data)
{
struct client *c = user_data;
struct pw_memmap *mm = *((struct pw_memmap **)data);
pw_loop_invoke(c->context.l, do_memmap_free, 0, NULL, 0, false, mm);
pw_loop_invoke(c->context.l, do_memmap_free, 0, data, size, false, c);
return 0;
}
@ -2827,6 +2828,7 @@ static int client_node_port_set_io(void *data,
mix_set_io(mix, ptr);
if (old != NULL) {
old->tag[0] = SPA_ID_INVALID;
pw_core_set_paused(c->core, true);
pw_data_loop_invoke(c->loop,
do_queue_memmap_free, SPA_ID_INVALID, &old, sizeof(&old), false, c);
old = NULL;