fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-09 06:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

internal-comp-loader: generate a "provides" for components that don't have one

Browse source 
It is valid for components not to have a "provides" field, but it
prevents them from being able to have "before" and "after" dependencies.
With this patch, we generate a hidden "provides" field so that the
dependencies sorting algorithm can work without issues.

Fixes: #771
This commit is contained in:
George Kiagiadakis 2025-02-13 16:06:29 +02:00
parent ac69acb3c2
commit 32d2abdf34
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/wp/private/internal-comp-loader.c
View file

@ -28,7 +28,7 @@ struct _ComponentData
grefcount ref; grefcount ref;
/* an identifier for this component that is understandable by the end user */ /* an identifier for this component that is understandable by the end user */
gchar *printable_id; gchar *printable_id;
/* the provided feature name or NULL */ /* the provided feature name */
gchar *provides; gchar *provides;
/* the original state of the feature (required / optional / disabled) */ /* the original state of the feature (required / optional / disabled) */
FeatureState state; FeatureState state;
@ -205,7 +205,7 @@ component_data_new_from_json (WpSpaJson * json, WpProperties * features,
comp->printable_id = g_strdup_printf ("%s [%s]", comp->provides, comp->type); comp->printable_id = g_strdup_printf ("%s [%s]", comp->provides, comp->type);
} }
} else { } else {
comp->provides = NULL; comp->provides = g_strdup_printf ("__anonymous_%p", comp);
comp->state = FEATURE_STATE_REQUIRED; comp->state = FEATURE_STATE_REQUIRED;
comp->printable_id = g_strdup_printf ("[%s: %s]", comp->type, comp->name); comp->printable_id = g_strdup_printf ("[%s: %s]", comp->type, comp->name);
} }
@ -328,7 +328,7 @@ wp_component_array_load_task_get_next_step (WpTransition * transition, guint ste
static gboolean static gboolean
component_equals (const ComponentData * comp, const gchar * provides) component_equals (const ComponentData * comp, const gchar * provides)
{ {
return (comp->provides && g_str_equal (provides, comp->provides)); return g_str_equal (provides, comp->provides);
} }
static inline gboolean static inline gboolean
@ -358,7 +358,7 @@ sort_components_before_after (WpComponentArrayLoadTask * self, GError ** error)
gchar *target_provides = g_ptr_array_index (comp->before, j); gchar *target_provides = g_ptr_array_index (comp->before, j);
for (guint k = 0; k < self->components->len; k++) { for (guint k = 0; k < self->components->len; k++) {
ComponentData *target = g_ptr_array_index (self->components, k); ComponentData *target = g_ptr_array_index (self->components, k);
if (target->provides && g_str_equal (target_provides, target->provides)) { if (g_str_equal (target_provides, target->provides)) {
g_ptr_array_insert (target->after, -1, g_strdup (comp->provides)); g_ptr_array_insert (target->after, -1, g_strdup (comp->provides));
} }
} }
@ -531,9 +531,8 @@ parse_components (WpComponentArrayLoadTask * self, GError ** error)
if (comp->state == FEATURE_STATE_REQUIRED) if (comp->state == FEATURE_STATE_REQUIRED)
g_ptr_array_add (required_components, component_data_ref (comp)); g_ptr_array_add (required_components, component_data_ref (comp));
if (comp->provides) g_hash_table_insert (self->feat_components, comp->provides,
g_hash_table_insert (self->feat_components, comp->provides, component_data_ref (comp));
component_data_ref (comp));
} }
/* topological sorting based on depth-first search */ /* topological sorting based on depth-first search */