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

media-session: handle node destroy during linking

Browse source 
Mark a node as busy linking while we call _create_links. The
_create_links method does a roundtrip and this might cause the node
to be destroyed. Set a flag when we notice this and avoid accessing
the destroyed object.
This commit is contained in:
Wim Taymans 2021-03-26 13:07:28 +01:00
parent d805253c69
commit f6356a3441
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/examples/media-session/policy-node.c
View file

@ -81,6 +81,7 @@ struct impl {
struct spa_list node_list; struct spa_list node_list;
unsigned int node_list_changed:1; unsigned int node_list_changed:1;
unsigned int linking_node_removed:1;
int seq; int seq;
struct default_node defaults[4]; struct default_node defaults[4];
@ -125,6 +126,7 @@ struct node {
unsigned int moving:1; unsigned int moving:1;
unsigned int capture_sink:1; unsigned int capture_sink:1;
unsigned int virtual:1; unsigned int virtual:1;
unsigned int linking:1;
}; };
static int check_new_target(struct impl *impl, struct node *target); static int check_new_target(struct impl *impl, struct node *target);
@ -366,6 +368,8 @@ handle_node(struct impl *impl, struct sm_object *object)
static void destroy_node(struct impl *impl, struct node *node) static void destroy_node(struct impl *impl, struct node *node)
{ {
spa_list_remove(&node->link); spa_list_remove(&node->link);
if (node->linking)
impl->linking_node_removed = true;
impl->node_list_changed = true; impl->node_list_changed = true;
if (node->enabled) if (node->enabled)
spa_hook_remove(&node->listener); spa_hook_remove(&node->listener);
@ -644,7 +648,16 @@ static int link_nodes(struct node *node, struct node *peer)
pw_properties_setf(props, PW_KEY_LINK_INPUT_NODE, "%d", input->id); pw_properties_setf(props, PW_KEY_LINK_INPUT_NODE, "%d", input->id);
pw_log_info("linking node %d to node %d", output->id, input->id); pw_log_info("linking node %d to node %d", output->id, input->id);
node->linking = true;
res = sm_media_session_create_links(impl->session, &props->dict); res = sm_media_session_create_links(impl->session, &props->dict);
pw_properties_free(props);
if (impl->linking_node_removed) {
impl->linking_node_removed = false;
return -ENOENT;
}
node->linking = false;
if (res > 0) { if (res > 0) {
node->peer = peer; node->peer = peer;
node->failed_peer = NULL; node->failed_peer = NULL;
@ -656,8 +669,6 @@ static int link_nodes(struct node *node, struct node *peer)
node->failed_peer = peer; node->failed_peer = peer;
node->failed_count++; node->failed_count++;
} }
pw_properties_free(props);
return res; return res;
} }