Move DEBUG_FULL_MB to properly named CONFIG_URCU_AVOID_SIGNALS

[urcu.git] / urcu.c

diff --git a/urcu.c b/urcu.c
index f219e7632f50d232cbb3f73c75b097f56246215f..8fae8faea8f4bd7b260cdcf6df69777a753a9b58 100644 (file)
--- a/urcu.c
+++ b/urcu.c
@@ -36,7 +36,7 @@
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu.h"
 
-#ifndef DEBUG_FULL_MB
+#ifndef CONFIG_URCU_AVOID_SIGNALS
 void __attribute__((constructor)) urcu_init(void);
 void __attribute__((destructor)) urcu_exit(void);
 #else
@@ -127,7 +127,7 @@ static void switch_next_urcu_qparity(void)
        STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR_BIT);
 }
 
-#ifdef DEBUG_FULL_MB
+#ifdef CONFIG_URCU_AVOID_SIGNALS
 #ifdef HAS_INCOHERENT_CACHES
 static void force_mb_single_thread(struct reader_registry *index)
 {
@@ -139,7 +139,7 @@ static void force_mb_all_threads(void)
 {
        smp_mb();
 }
-#else /* #ifdef DEBUG_FULL_MB */
+#else /* #ifdef CONFIG_URCU_AVOID_SIGNALS */
 #ifdef HAS_INCOHERENT_CACHES
 static void force_mb_single_thread(struct reader_registry *index)
 {
@@ -206,7 +206,7 @@ static void force_mb_all_threads(void)
        }
        smp_mb();       /* read ->need_mb before ending the barrier */
 }
-#endif /* #else #ifdef DEBUG_FULL_MB */
+#endif /* #else #ifdef CONFIG_URCU_AVOID_SIGNALS */
 
 void wait_for_quiescent_state(void)
 {
@@ -420,7 +420,7 @@ void rcu_unregister_thread(void)
        internal_urcu_unlock();
 }
 
-#ifndef DEBUG_FULL_MB
+#ifndef CONFIG_URCU_AVOID_SIGNALS
 static void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)
 {
        /*
@@ -451,7 +451,7 @@ void urcu_init(void)
        init_done = 1;
 
        act.sa_sigaction = sigurcu_handler;
-       act.sa_flags = SA_SIGINFO;
+       act.sa_flags = SA_SIGINFO | SA_RESTART;
        sigemptyset(&act.sa_mask);
        ret = sigaction(SIGURCU, &act, NULL);
        if (ret) {
@@ -473,4 +473,4 @@ void urcu_exit(void)
        assert(act.sa_sigaction == sigurcu_handler);
        free(registry);
 }
-#endif /* #ifndef DEBUG_FULL_MB */
+#endif /* #ifndef CONFIG_URCU_AVOID_SIGNALS */