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

context: limit recursion in run_nodes

Browse source 
Limit the amount of recursion in run_nodes() for now until we find out
why it keeps on recursing.

See #3621
This commit is contained in:
Wim Taymans 2023-11-03 15:38:05 +01:00
parent baac9aa549
commit 90e4ee94ec
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/pipewire/context.c
View file

@ -32,6 +32,8 @@
PW_LOG_TOPIC_EXTERN(log_context); PW_LOG_TOPIC_EXTERN(log_context);
#define PW_LOG_TOPIC_DEFAULT log_context #define PW_LOG_TOPIC_DEFAULT log_context
#define MAX_HOPS 64
/** \cond */ /** \cond */
struct impl { struct impl {
struct pw_context this; struct pw_context this;
@ -791,12 +793,17 @@ static int ensure_state(struct pw_impl_node *node, bool running)
* and groups to active nodes and make them recursively runnable as well. * and groups to active nodes and make them recursively runnable as well.
*/ */
static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node, static inline int run_nodes(struct pw_context *context, struct pw_impl_node *node,
struct spa_list *nodes, enum pw_direction direction) struct spa_list *nodes, enum pw_direction direction, int hop)
{ {
struct pw_impl_node *t; struct pw_impl_node *t;
struct pw_impl_port *p; struct pw_impl_port *p;
struct pw_impl_link *l; struct pw_impl_link *l;
if (hop == MAX_HOPS) {
pw_log_warn("exceeded hops (%d)", hop);
return -EIO;
}
pw_log_debug("node %p: '%s' direction:%s", node, node->name, pw_log_debug("node %p: '%s' direction:%s", node, node->name,
pw_direction_as_string(direction)); pw_direction_as_string(direction));
@ -813,7 +820,7 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod
pw_log_debug(" peer %p: '%s'", t, t->name); pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true; t->runnable = true;
run_nodes(context, t, nodes, direction); run_nodes(context, t, nodes, direction, hop + 1);
} }
} }
} else { } else {
@ -827,7 +834,7 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod
pw_log_debug(" peer %p: '%s'", t, t->name); pw_log_debug(" peer %p: '%s'", t, t->name);
t->runnable = true; t->runnable = true;
run_nodes(context, t, nodes, direction); run_nodes(context, t, nodes, direction, hop + 1);
} }
} }
} }
@ -847,7 +854,7 @@ static inline int run_nodes(struct pw_context *context, struct pw_impl_node *nod
pw_log_debug(" group %p: '%s'", t, t->name); pw_log_debug(" group %p: '%s'", t, t->name);
t->runnable = true; t->runnable = true;
if (!t->driving) if (!t->driving)
run_nodes(context, t, nodes, direction); run_nodes(context, t, nodes, direction, hop + 1);
} }
} }
return 0; return 0;
@ -950,8 +957,8 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node,
} }
spa_list_for_each(n, collect, sort_link) spa_list_for_each(n, collect, sort_link)
if (!n->driving && n->runnable) { if (!n->driving && n->runnable) {
run_nodes(context, n, collect, PW_DIRECTION_OUTPUT); run_nodes(context, n, collect, PW_DIRECTION_OUTPUT, 0);
run_nodes(context, n, collect, PW_DIRECTION_INPUT); run_nodes(context, n, collect, PW_DIRECTION_INPUT, 0);
} }
return 0; return 0;