mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: keep context lock locked for callbacks

Browse source 
Also keep the context lock locked with emiting the registration,
portregistration and connect callbacks.

All the other callbacks are emited with the lock and it makes sense to
also emit these ones with the lock so that code in the callback gets
a consitent view.

See #1265
This commit is contained in:
Wim Taymans 2021-06-13 19:26:10 +02:00
parent 1bc383a7b7
commit e3a2f4a645
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2615,8 +2615,6 @@ static void registry_event_global(void *data, uint32_t id,
pw_map_insert_at(&c->context.globals, id, o);
pthread_mutex_unlock(&c->context.lock);
pw_thread_loop_unlock(c->context.loop);
switch (o->type) {
case INTERFACE_Node:
if (c->registration_callback && is_first)
@ -2633,7 +2631,6 @@ static void registry_event_global(void *data, uint32_t id,
c->connect_callback(o->port_link.src, o->port_link.dst, 1, c->connect_arg);
break;
}
pw_thread_loop_lock(c->context.loop);
exit:
return;
@ -2670,8 +2667,6 @@ static void registry_event_global_remove(void *object, uint32_t id)
if (o->type == INTERFACE_Node)
is_last = find_node(c, o->node.name) == NULL;
pw_thread_loop_unlock(c->context.loop);
switch (o->type) {
case INTERFACE_Node:
if (c->metadata) {
@ -2692,7 +2687,6 @@ static void registry_event_global_remove(void *object, uint32_t id)
c->connect_callback(o->port_link.src, o->port_link.dst, 0, c->connect_arg);
break;
}
pw_thread_loop_lock(c->context.loop);
/* we keep the object available with the id because jack clients
* tend to access the objects with it later.