X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu.c;h=07537efbc55c90943b49f1a240aab5935fc55bc7;hb=a669219f71cabe41a5832bdda98c94e4ad63e529;hp=8fae8faea8f4bd7b260cdcf6df69777a753a9b58;hpb=b4ce15269d95cb1fc5542d0e192ec593b2222dd5;p=urcu.git

diff --git a/urcu.c b/urcu.c
index 8fae8fa..07537ef 100644
--- a/urcu.c
+++ b/urcu.c
@@ -36,11 +36,11 @@
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu.h"
 
-#ifndef CONFIG_URCU_AVOID_SIGNALS
+#ifndef URCU_MB
 void __attribute__((constructor)) urcu_init(void);
 void __attribute__((destructor)) urcu_exit(void);
 #else
-static inline void urcu_init(void)
+void urcu_init(void)
 {
 }
 #endif
@@ -52,7 +52,7 @@ pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 /*
  * Global grace period counter.
  * Contains the current RCU_GP_CTR_BIT.
- * Also has a RCU_GP_CTR_BIT of 1, to accelerate the reader fast path.
+ * Also has a RCU_GP_COUNT of 1, to accelerate the reader fast path.
  * Written to only by writer with mutex taken. Read by both writer and readers.
  */
 long urcu_gp_ctr = RCU_GP_COUNT;
@@ -127,7 +127,7 @@ static void switch_next_urcu_qparity(void)
 	STORE_SHARED(urcu_gp_ctr, urcu_gp_ctr ^ RCU_GP_CTR_BIT);
 }
 
-#ifdef CONFIG_URCU_AVOID_SIGNALS
+#ifdef URCU_MB
 #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 CONFIG_URCU_AVOID_SIGNALS */
+#else /* #ifdef URCU_MB */
 #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 CONFIG_URCU_AVOID_SIGNALS */
+#endif /* #else #ifdef URCU_MB */
 
 void wait_for_quiescent_state(void)
 {
@@ -420,7 +420,7 @@ void rcu_unregister_thread(void)
 	internal_urcu_unlock();
 }
 
-#ifndef CONFIG_URCU_AVOID_SIGNALS
+#ifndef URCU_MB
 static void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)
 {
 	/*
@@ -473,4 +473,4 @@ void urcu_exit(void)
 	assert(act.sa_sigaction == sigurcu_handler);
 	free(registry);
 }
-#endif /* #ifndef CONFIG_URCU_AVOID_SIGNALS */
+#endif /* #ifndef URCU_MB */