X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Furcu-bp.c;h=dd7b7922e62e286342e532a017717a7375f5933c;hb=379252796aab7571210d4a2e8eb9886e913c0036;hp=5281d5e852b053eb2fc4ad19d562b84ae04ddb56;hpb=b765fbc1652748650f583d228a8f1f12df0baf48;p=userspace-rcu.git

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