From dd9fd95c75feb48d32f838935b20873f0c685326 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 14 Jan 2022 20:01:44 +0100 Subject: [PATCH] Revert "context: improve retry logic" This reverts commit bc164814cc6e218618eefe39a66a6336a13b3b0c. --- src/pipewire/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pipewire/context.c b/src/pipewire/context.c index f473177f7..e83b85238 100644 --- a/src/pipewire/context.c +++ b/src/pipewire/context.c @@ -593,13 +593,13 @@ static struct pw_global *find_global(struct pw_context *context, uint32_t id) static uint32_t next_global_id(struct pw_context *context) { - uint32_t id, start = context->serial; + uint32_t id, retry = 0; + while (true) { - id = context->serial; - context->serial = (context->serial+1) & 0xffffff; + id = context->serial++ & 0xffffff; if (find_global(context, id) == NULL) return id; - if (context->serial == start) + if (retry++ > 4096) break; } return SPA_ID_INVALID; @@ -609,7 +609,6 @@ uint32_t pw_context_add_global(struct pw_context *context, struct pw_global *glo { global->id = next_global_id(context); spa_list_append(&context->global_list, &global->link); - return global->id; } void pw_context_remove_global(struct pw_context *context, struct pw_global *global)