From f81bb670c35331772746388156bfb7ff4070af4a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 15 Sep 2025 10:15:01 +0200 Subject: [PATCH] Revert "impl-node: improve the node unprepare function" This reverts commit 2891e579a129b4b3dc10d8cd965545425fa66f59. This seems to cause regresssions with nodes xrun etc. See #4893 --- src/pipewire/impl-node.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index 5d360e88c..2c1db3e2a 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -240,21 +240,17 @@ do_node_unprepare(struct spa_loop *loop, bool async, uint32_t seq, { struct pw_impl_node *this = user_data; struct pw_node_target *t; - int old_state, new_state; + int old_state; uint64_t trigger = 0; pw_log_trace("%p: unprepare %d remote:%d exported:%d", this, this->rt.prepared, this->remote, this->exported); - /* The remote client will INACTIVE itself and remove itself from the loop to avoid - * being scheduled. - * The server will mark remote nodes as FINISHED. This will make sure the node will not - * trigger the peers anymore when it will stop because we do that on the server side - * because the client might simply be dead and not able to resume anything. - */ - new_state = this->remote ? PW_NODE_ACTIVATION_FINISHED : PW_NODE_ACTIVATION_INACTIVE; - - old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, new_state); + /* 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). + * If we were supposed to be scheduled make sure we continue the graph for the peers we + * were supposed to trigger */ + old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, PW_NODE_ACTIVATION_INACTIVE); if (PW_NODE_ACTIVATION_PENDING_TRIGGER(old_state)) trigger = get_time_ns(this->rt.target.system);