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

context: improve retry logic

Browse source 
Remove the useless retry logic and fail when we wrapped around
while scanning for an unused id.
This commit is contained in:
Wim Taymans 2022-01-13 16:35:48 +01:00
parent 5baab24848
commit bc164814cc
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pipewire/context.c
View file

@ -592,13 +592,13 @@ static struct pw_global *find_global(struct pw_context *context, uint32_t id)
static uint32_t next_global_id(struct pw_context *context) static uint32_t next_global_id(struct pw_context *context)
{ {
uint32_t id, retry = 0; uint32_t id, start = context->serial;
while (true) { while (true) {
id = context->serial++ & 0xffffff; id = context->serial;
context->serial = (context->serial+1) & 0xffffff;
if (find_global(context, id) == NULL) if (find_global(context, id) == NULL)
return id; return id;
if (retry++ > 4096) if (context->serial == start)
break; break;
} }
return SPA_ID_INVALID; return SPA_ID_INVALID;
@ -608,6 +608,7 @@ uint32_t pw_context_add_global(struct pw_context *context, struct pw_global *glo
{ {
global->id = next_global_id(context); global->id = next_global_id(context);
spa_list_append(&context->global_list, &global->link); spa_list_append(&context->global_list, &global->link);
return global->id;
} }
void pw_context_remove_global(struct pw_context *context, struct pw_global *global) void pw_context_remove_global(struct pw_context *context, struct pw_global *global)