mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: improve do_sync

Browse source 
Keep track of the last scheduled sync operation and wake up listeners
when it completes.

The waiters also compare against the last issued sync so that when multiple
syncs are pending from multiple threads, they will all wakeup instead of
just one.

Fixes some lockups with ardour6.
This commit is contained in:
Wim Taymans 2021-09-07 17:13:15 +02:00
parent c25cec230c
commit a54fa5f26d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,6 +288,7 @@ struct client {
struct pw_core *core; struct pw_core *core;
struct spa_hook core_listener; struct spa_hook core_listener;
struct pw_mempool *pool; struct pw_mempool *pool;
int pending_sync;
int last_sync; int last_sync;
int last_res; int last_res;
bool error; bool error;
@ -772,7 +773,8 @@ static void on_sync_reply(void *data, uint32_t id, int seq)
if (id != PW_ID_CORE) if (id != PW_ID_CORE)
return; return;
client->last_sync = seq; client->last_sync = seq;
pw_thread_loop_signal(client->context.loop, false); if (client->pending_sync == seq)
pw_thread_loop_signal(client->context.loop, false);
} }
@ -800,14 +802,12 @@ static const struct pw_core_events core_events = {
static int do_sync(struct client *client) static int do_sync(struct client *client)
{ {
int seq;
if (pw_thread_loop_in_thread(client->context.loop)) { if (pw_thread_loop_in_thread(client->context.loop)) {
pw_log_warn("sync requested from callback"); pw_log_warn("sync requested from callback");
return 0; return 0;
} }
seq = pw_proxy_sync((struct pw_proxy*)client->core, client->last_sync); client->pending_sync = pw_proxy_sync((struct pw_proxy*)client->core, client->pending_sync);
while (true) { while (true) {
pw_thread_loop_wait(client->context.loop); pw_thread_loop_wait(client->context.loop);
@ -815,7 +815,7 @@ static int do_sync(struct client *client)
if (client->error) if (client->error)
return client->last_res; return client->last_res;
if (client->last_sync == seq) if (client->pending_sync == client->last_sync)
break; break;
} }
return 0; return 0;