X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.h;h=0fa2fea7c4515a8c86be17673668692ac6692684;hp=c6c54e7c7c3bcbc83d88b279e20ab35f64a0806f;hb=acfd099eae9026369f558e73b2a7e35860962d9d;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e

diff --git a/urcu.h b/urcu.h
index c6c54e7..0fa2fea 100644
--- a/urcu.h
+++ b/urcu.h
@@ -43,12 +43,14 @@
 extern "C" {
 #endif 
 
+#include "urcu/map/urcu.h"
+
 /*
  * Important !
  *
  * Each thread containing read-side critical sections must be registered
- * with rcu_register_thread() before calling rcu_read_lock().
- * rcu_unregister_thread() should be called before the thread exits.
+ * with rcu_register_thread_mb() before calling rcu_read_lock_mb().
+ * rcu_unregister_thread_mb() should be called before the thread exits.
  */
 
 #ifdef _LGPL_SOURCE
@@ -68,8 +70,16 @@ extern "C" {
  * DON'T FORGET TO USE RCU_REGISTER/UNREGISTER_THREAD() FOR EACH THREAD WITH
  * READ-SIDE CRITICAL SECTION.
  */
-#define rcu_read_lock()		_rcu_read_lock()
-#define rcu_read_unlock()	_rcu_read_unlock()
+#ifdef RCU_MEMBARRIER
+#define rcu_read_lock_memb		_rcu_read_lock
+#define rcu_read_unlock_memb		_rcu_read_unlock
+#elif defined(RCU_SIGNAL)
+#define rcu_read_lock_sig		_rcu_read_lock
+#define rcu_read_unlock_sig		_rcu_read_unlock
+#elif defined(RCU_MB)
+#define rcu_read_lock_mb		_rcu_read_lock
+#define rcu_read_unlock_mb		_rcu_read_unlock
+#endif
 
 #else /* !_LGPL_SOURCE */
 
@@ -100,4 +110,7 @@ extern void rcu_init(void);
 }
 #endif
 
+#include "urcu-call-rcu.h"
+#include "urcu-defer.h"
+
 #endif /* _URCU_H */