X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Furcu-bp.c;h=47fad8e870ee5f1bffb3b829cb2f3c3bd6abd264;hb=d8befef26777884ffa55bb6c1a51f90971e12579;hp=a097d7f00312a1372123f5c61a732f0e8270354d;hpb=014775106c60f02818ca755b331f887030bd440f;p=userspace-rcu.git

diff --git a/src/urcu-bp.c b/src/urcu-bp.c
index a097d7f..47fad8e 100644
--- a/src/urcu-bp.c
+++ b/src/urcu-bp.c
@@ -120,7 +120,10 @@ 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
 int urcu_bp_has_sys_membarrier;
@@ -673,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
@@ -769,3 +779,4 @@ DEFINE_RCU_FLAVOR(rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"
+#include "urcu-poll-impl.h"