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

Revert "global: avoid using existing global id"

Browse source 
This reverts commit 5baab24848.
This commit is contained in:
Wim Taymans 2022-01-14 20:01:53 +01:00
parent dd9fd95c75
commit e68dc49666
3 changed files with 6 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pipewire/context.c
View file

@ -571,8 +571,6 @@ int pw_context_for_each_global(struct pw_context *context,
int res; int res;
spa_list_for_each_safe(g, t, &context->global_list, link) { spa_list_for_each_safe(g, t, &context->global_list, link) {
if (!g->registered)
continue;
if (!global_can_read(context, g)) if (!global_can_read(context, g))
continue; continue;
if ((res = callback(data, g)) != 0) if ((res = callback(data, g)) != 0)
@ -591,36 +589,12 @@ static struct pw_global *find_global(struct pw_context *context, uint32_t id)
return NULL; return NULL;
} }
static uint32_t next_global_id(struct pw_context *context)
{
uint32_t id, retry = 0;
while (true) {
id = context->serial++ & 0xffffff;
if (find_global(context, id) == NULL)
return id;
if (retry++ > 4096)
break;
}
return SPA_ID_INVALID;
}
uint32_t pw_context_add_global(struct pw_context *context, struct pw_global *global)
{
global->id = next_global_id(context);
spa_list_append(&context->global_list, &global->link);
}
void pw_context_remove_global(struct pw_context *context, struct pw_global *global)
{
spa_list_remove(&global->link);
}
SPA_EXPORT SPA_EXPORT
struct pw_global *pw_context_find_global(struct pw_context *context, uint32_t id) struct pw_global *pw_context_find_global(struct pw_context *context, uint32_t id)
{ {
struct pw_global *global; struct pw_global *global;
global = find_global(context, id); global = find_global(context, id);
if (global == NULL || !global->registered) { if (global == NULL || !global->registered) {
errno = ENOENT; errno = ENOENT;

8
src/pipewire/global.c
View file

@ -36,6 +36,8 @@
PW_LOG_TOPIC_EXTERN(log_global); PW_LOG_TOPIC_EXTERN(log_global);
#define PW_LOG_TOPIC_DEFAULT log_global #define PW_LOG_TOPIC_DEFAULT log_global
static uint32_t serial = 0;
/** \cond */ /** \cond */
struct impl { struct impl {
struct pw_global this; struct pw_global this;
@ -94,12 +96,11 @@ pw_global_new(struct pw_context *context,
this->func = func; this->func = func;
this->object = object; this->object = object;
this->properties = properties; this->properties = properties;
this->id = serial++ & 0xffffff;
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);
pw_context_add_global(context, this);
pw_log_debug("%p: new %s %d", this, this->type, this->id); pw_log_debug("%p: new %s %d", this, this->type, this->id);
return this; return this;
@ -125,6 +126,7 @@ int pw_global_register(struct pw_global *global)
if (global->registered) if (global->registered)
return -EEXIST; return -EEXIST;
spa_list_append(&context->global_list, &global->link);
global->registered = true; global->registered = true;
spa_list_for_each(registry, &context->registry_resource_list, link) { spa_list_for_each(registry, &context->registry_resource_list, link) {
@ -161,6 +163,7 @@ static int global_unregister(struct pw_global *global)
pw_registry_resource_global_remove(resource, global->id); pw_registry_resource_global_remove(resource, global->id);
} }
spa_list_remove(&global->link);
global->registered = false; global->registered = false;
pw_log_debug("%p: unregistered %u", global, global->id); pw_log_debug("%p: unregistered %u", global, global->id);
@ -365,7 +368,6 @@ void pw_global_destroy(struct pw_global *global)
struct pw_resource *resource; struct pw_resource *resource;
global->destroyed = true; global->destroyed = true;
pw_context_remove_global(global->context, global);
pw_log_debug("%p: destroy %u", global, global->id); pw_log_debug("%p: destroy %u", global, global->id);
pw_global_emit_destroy(global); pw_global_emit_destroy(global);

4
src/pipewire/private.h
View file

@ -450,7 +450,6 @@ struct pw_context {
uint32_t n_support; /**< number of support items */ uint32_t n_support; /**< number of support items */
struct pw_array factory_lib; /**< mapping of factory_name regexp to library */ struct pw_array factory_lib; /**< mapping of factory_name regexp to library */
uint32_t serial;
struct pw_array objects; /**< objects */ struct pw_array objects; /**< objects */
struct pw_impl_client *current_client; /**< client currently executing code in mainloop */ struct pw_impl_client *current_client; /**< client currently executing code in mainloop */
@ -1116,9 +1115,6 @@ struct pw_control {
void *user_data; void *user_data;
}; };
uint32_t pw_context_add_global(struct pw_context *context, struct pw_global *global);
void pw_context_remove_global(struct pw_context *context, struct pw_global *global);
/** Find a good format between 2 ports */ /** Find a good format between 2 ports */
int pw_context_find_format(struct pw_context *context, int pw_context_find_format(struct pw_context *context,
struct pw_impl_port *output, struct pw_impl_port *output,