X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-static.h;h=0c6891e77ca0871f85cd1461333c0facd95bcf13;hp=91d37470fe785ffffd13dc7ebbebeb1357170cd7;hb=0fad128bbcd6f99f2a4ebbc976a76ef1e3155d1c;hpb=809f4fdeada96d22ac2d91603f3dfb68282f4071

diff --git a/urcu-static.h b/urcu-static.h
index 91d3747..0c6891e 100644
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -81,7 +81,9 @@
  * data read before the pointer read by speculating the value of the pointer.
  * Correct ordering is ensured because the pointer is read as a volatile access.
  * This acts as a global side-effect operation, which forbids reordering of
- * dependent memory operations.
+ * dependent memory operations. Note that such concern about dependency-breaking
+ * optimizations will eventually be taken care of by the "memory_order_consume"
+ * addition to forthcoming C++ standard.
  *
  * Should match rcu_assign_pointer() or rcu_xchg_pointer().
  */
@@ -115,6 +117,12 @@
  */
 #define KICK_READER_LOOPS 10000
 
+#ifdef DEBUG_RCU
+#define rcu_assert(args...)	assert(args)
+#else
+#define rcu_assert(args...)
+#endif
+
 #ifdef DEBUG_YIELD
 #include <sched.h>
 #include <time.h>
@@ -125,10 +133,10 @@
 #define YIELD_WRITE	(1 << 1)
 
 /*
- * Updates without CONFIG_URCU_AVOID_SIGNALS are much slower. Account this in
+ * Updates without URCU_MB are much slower. Account this in
  * the delay.
  */
-#ifdef CONFIG_URCU_AVOID_SIGNALS
+#ifdef URCU_MB
 /* maximum sleep delay, in us */
 #define MAX_SLEEP 50
 #else
@@ -171,7 +179,7 @@ static inline void debug_yield_init(void)
 }
 #endif
 
-#ifdef CONFIG_URCU_AVOID_SIGNALS
+#ifdef URCU_MB
 static inline void reader_barrier()
 {
 	smp_mb();