From: Mathieu Desnoyers Date: Mon, 13 Feb 2023 17:24:09 +0000 (-0500) Subject: Fix: urcu-bp: only teardown call-rcu worker in destructor X-Git-Tag: v0.13.3~1 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=379252796aab7571210d4a2e8eb9886e913c0036;p=urcu.git 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 --- diff --git a/src/urcu-bp.c b/src/urcu-bp.c index 5281d5e..dd7b792 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