mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

global: keep track of child globals

Browse source 
Keep track of the child globals and unregister when the parent
is unregistered.
This commit is contained in:
Wim Taymans 2019-05-14 12:00:22 +02:00
parent b474666e2e
commit d39d15b0d9
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/pipewire/global.c
View file

@ -97,6 +97,7 @@ pw_global_new(struct pw_core *core,
this->properties = properties; this->properties = properties;
this->id = pw_map_insert_new(&core->globals, this); this->id = pw_map_insert_new(&core->globals, this);
spa_list_init(&this->child_list);
spa_list_init(&this->resource_list); spa_list_init(&this->resource_list);
spa_hook_list_init(&this->listener_list); spa_hook_list_init(&this->listener_list);
@ -134,6 +135,7 @@ pw_global_register(struct pw_global *global,
if (parent == NULL) if (parent == NULL)
parent = global; parent = global;
global->parent = parent; global->parent = parent;
spa_list_append(&parent->child_list, &global->child_link);
spa_list_append(&core->global_list, &global->link); spa_list_append(&core->global_list, &global->link);
impl->registered = true; impl->registered = true;
@ -152,7 +154,7 @@ pw_global_register(struct pw_global *global,
&global->properties->dict : NULL); &global->properties->dict : NULL);
} }
pw_log_debug("global %p: add %u owner %p parent %p", global, global->id, owner, parent); pw_log_debug("global %p: registered %u owner %p parent %p", global, global->id, owner, parent);
pw_core_emit_global_added(core, global); pw_core_emit_global_added(core, global);
return 0; return 0;
@ -163,10 +165,17 @@ static int global_unregister(struct pw_global *global)
struct impl *impl = SPA_CONTAINER_OF(global, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(global, struct impl, this);
struct pw_core *core = global->core; struct pw_core *core = global->core;
struct pw_resource *resource; struct pw_resource *resource;
struct pw_global *g;
if (!impl->registered) if (!impl->registered)
return 0; return 0;
spa_list_consume(g, &global->child_list, child_link) {
if (g == global)
break;
global_unregister(g);
}
spa_list_for_each(resource, &core->registry_resource_list, link) { spa_list_for_each(resource, &core->registry_resource_list, link) {
uint32_t permissions = pw_global_get_permissions(global, resource->client); uint32_t permissions = pw_global_get_permissions(global, resource->client);
pw_log_debug("registry %p: global %d %08x", resource, global->id, permissions); pw_log_debug("registry %p: global %d %08x", resource, global->id, permissions);
@ -174,12 +183,15 @@ static int global_unregister(struct pw_global *global)
pw_registry_resource_global_remove(resource, global->id); pw_registry_resource_global_remove(resource, global->id);
} }
global->parent = NULL;
spa_list_remove(&global->child_link);
spa_list_remove(&global->link); spa_list_remove(&global->link);
pw_map_remove(&core->globals, global->id); pw_map_remove(&core->globals, global->id);
pw_core_emit_global_removed(core, global);
impl->registered = false; impl->registered = false;
pw_log_debug("global %p: unregistered %u", global, global->id);
pw_core_emit_global_removed(core, global);
return 0; return 0;
} }

2
src/pipewire/private.h
View file

@ -146,6 +146,8 @@ struct pw_global {
struct spa_list link; /**< link in core list of globals */ struct spa_list link; /**< link in core list of globals */
uint32_t id; /**< server id of the object */ uint32_t id; /**< server id of the object */
struct pw_global *parent; /**< parent global */ struct pw_global *parent; /**< parent global */
struct spa_list child_link; /**< link in parent child list of globals */
struct spa_list child_list; /**< The list of child globals */
struct pw_properties *properties; /**< properties of the global */ struct pw_properties *properties; /**< properties of the global */