From d8befef26777884ffa55bb6c1a51f90971e12579 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 13 Feb 2023 12:24:09 -0500 Subject: [PATCH] Fix: urcu-bp: only teardown call-rcu worker in destructor Do not invoke urcu_call_rcu_exit() every time a reader thread unregisters from urcu-bp. This causes pthread join hangs observed on Cygwin. Signed-off-by: Mathieu Desnoyers Change-Id: I4e5c6e06df9966d65f2dcf01bb3281cbfcb05a5b --- src/urcu-bp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/urcu-bp.c b/src/urcu-bp.c index f886ec4..47fad8e 100644 --- a/src/urcu-bp.c +++ b/src/urcu-bp.c @@ -120,7 +120,9 @@ enum membarrier_cmd { static void __attribute__((constructor)) _urcu_bp_init(void); static -void __attribute__((destructor)) urcu_bp_exit(void); +void urcu_bp_exit(void); +static +void __attribute__((destructor)) urcu_bp_exit_destructor(void); static void urcu_call_rcu_exit(void); #ifndef CONFIG_RCU_FORCE_SYS_MEMBARRIER @@ -656,8 +658,6 @@ void _urcu_bp_init(void) static void urcu_bp_exit(void) { - urcu_call_rcu_exit(); - mutex_lock(&init_lock); if (!--urcu_bp_refcount) { struct registry_chunk *chunk, *tmp; @@ -676,6 +676,13 @@ void urcu_bp_exit(void) mutex_unlock(&init_lock); } +static +void urcu_bp_exit_destructor(void) +{ + urcu_call_rcu_exit(); + urcu_bp_exit(); +} + /* * Holding the rcu_gp_lock and rcu_registry_lock across fork will make * sure we fork() don't race with a concurrent thread executing with -- 2.34.1