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

impl-node: always INACTIVATE a node when stopping

Browse source 
Set the node state INACTIVE on the client and server side in all cases
when stopping to ensure nothing tries to schedule the node anymore.
This commit is contained in:
Wim Taymans 2024-08-08 15:15:39 +02:00
parent 5afdd54277
commit cc2c86a55b
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2400,13 +2400,14 @@ static int do_unprepare_client(struct spa_loop *loop, bool async, uint32_t seq,
struct link *l; struct link *l;
pw_log_debug("%p prepared:%d ", c, c->rt.prepared); pw_log_debug("%p prepared:%d ", c, c->rt.prepared);
if (!c->rt.prepared)
return 0;
old_state = SPA_ATOMIC_XCHG(c->activation->status, PW_NODE_ACTIVATION_INACTIVE); old_state = SPA_ATOMIC_XCHG(c->activation->status, PW_NODE_ACTIVATION_INACTIVE);
if (old_state != PW_NODE_ACTIVATION_FINISHED) if (old_state != PW_NODE_ACTIVATION_FINISHED)
trigger = get_time_ns(c->l->system); trigger = get_time_ns(c->l->system);
if (!c->rt.prepared)
return 0;
spa_list_for_each(l, &c->rt.target_links, target_link) { spa_list_for_each(l, &c->rt.target_links, target_link) {
if (!c->async && trigger != 0) if (!c->async && trigger != 0)
l->trigger(l, trigger); l->trigger(l, trigger);

17
src/pipewire/impl-node.c
View file

@ -222,15 +222,14 @@ do_node_unprepare(struct spa_loop *loop, bool async, uint32_t seq,
pw_log_trace("%p: unprepare %d remote:%d exported:%d", this, this->rt.prepared, pw_log_trace("%p: unprepare %d remote:%d exported:%d", this, this->rt.prepared,
this->remote, this->exported); this->remote, this->exported);
if (!this->exported) { /* We mark ourself as finished now, this will avoid going further into the process loop
/* We mark ourself as finished now, this will avoid going further into the process loop * in case our fd was ready (removing ourselfs from the loop should avoid that as well).
* in case our fd was ready (removing ourselfs from the loop should avoid that as well). * If we were supposed to be scheduled make sure we continue the graph for the peers we
* If we were supposed to be scheduled make sure we continue the graph for the peers we * were supposed to trigger */
* were supposed to trigger */ old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, PW_NODE_ACTIVATION_INACTIVE);
old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, PW_NODE_ACTIVATION_INACTIVE); if (PW_NODE_ACTIVATION_PENDING_TRIGGER(old_state))
if (PW_NODE_ACTIVATION_PENDING_TRIGGER(old_state)) trigger = get_time_ns(this->rt.target.system);
trigger = get_time_ns(this->rt.target.system);
}
if (!this->rt.prepared) if (!this->rt.prepared)
return 0; return 0;