X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.h;h=bb0523c904916062ae1ee4843c8ee5085dd8ee8f;hp=1dc4ddd6d27a0a59a810c5c7652e984374a0ac91;hb=882f335739b978d1c55be2faeed077f315afe5d7;hpb=7ac06cef7a7d9394332837edc5c0e9595286a5fc

diff --git a/urcu-qsbr.h b/urcu-qsbr.h
index 1dc4ddd..bb0523c 100644
--- a/urcu-qsbr.h
+++ b/urcu-qsbr.h
@@ -31,6 +31,18 @@
 #include <stdlib.h>
 #include <pthread.h>
 
+/*
+ * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer
+ * publication headers.
+ */
+#include <urcu-pointer.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
+#include <urcu/map/urcu-qsbr.h>
+
 /*
  * Important !
  *
@@ -41,24 +53,28 @@
 
 #ifdef _LGPL_SOURCE
 
-#include <urcu-qsbr-static.h>
+#include <urcu/static/urcu-qsbr.h>
 
 /*
  * Mappings for static use of the userspace RCU library.
  * Should only be used in LGPL-compatible code.
  */
 
-#define rcu_dereference		_rcu_dereference
-#define rcu_read_lock		_rcu_read_lock
-#define rcu_read_unlock		_rcu_read_unlock
-
-#define rcu_quiescent_state	_rcu_quiescent_state
-#define rcu_thread_offline	_rcu_thread_offline
-#define rcu_thread_online	_rcu_thread_online
+/*
+ * rcu_read_lock()
+ * rcu_read_unlock()
+ *
+ * Mark the beginning and end of a read-side critical section.
+ * DON'T FORGET TO USE rcu_register_thread/rcu_unregister_thread()
+ * FOR EACH THREAD WITH READ-SIDE CRITICAL SECTION.
+ */
+#define rcu_read_lock_qsbr		_rcu_read_lock
+#define rcu_read_unlock_qsbr		_rcu_read_unlock
+#define rcu_read_ongoing_qsbr		_rcu_read_ongoing
 
-#define rcu_assign_pointer	_rcu_assign_pointer
-#define rcu_xchg_pointer	_rcu_xchg_pointer
-#define rcu_publish_content	_rcu_publish_content
+#define rcu_quiescent_state_qsbr	_rcu_quiescent_state
+#define rcu_thread_offline_qsbr		_rcu_thread_offline
+#define rcu_thread_online_qsbr		_rcu_thread_online
 
 #else /* !_LGPL_SOURCE */
 
@@ -66,28 +82,37 @@
  * library wrappers to be used by non-LGPL compatible source code.
  */
 
+/*
+ * QSBR read lock/unlock are guaranteed to be no-ops. Therefore, we expose them
+ * in the LGPL header for any code to use. However, the debug version is not
+ * nops and may contain sanity checks. To activate it, applications must be
+ * recompiled with -DRCU_DEBUG (even non-LGPL/GPL applications). This is the
+ * best trade-off between license/performance/code triviality and
+ * library debugging & tracing features we could come up with.
+ */
+
+#if (!defined(BUILD_QSBR_LIB) && defined(RCU_DEBUG))
+
+static inline void rcu_read_lock(void)
+{
+}
+
+static inline void rcu_read_unlock(void)
+{
+}
+
+#else /* !RCU_DEBUG */
+
 extern void rcu_read_lock(void);
 extern void rcu_read_unlock(void);
 
-extern void *rcu_dereference(void *p);
+#endif /* !RCU_DEBUG */
 
+extern int rcu_read_ongoing(void);
 extern void rcu_quiescent_state(void);
 extern void rcu_thread_offline(void);
 extern void rcu_thread_online(void);
 
-extern void *rcu_assign_pointer_sym(void **p, void *v);
-
-#define rcu_assign_pointer(p, v)			\
-	rcu_assign_pointer_sym((void **)(p), (v))
-
-extern void *rcu_xchg_pointer_sym(void **p, void *v);
-#define rcu_xchg_pointer(p, v)				\
-	rcu_xchg_pointer_sym((void **)(p), (v))
-
-extern void *rcu_publish_content_sym(void **p, void *v);
-#define rcu_publish_content(p, v)			\
-	rcu_publish_content_sym((void **)(p), (v))
-
 #endif /* !_LGPL_SOURCE */
 
 extern void synchronize_rcu(void);
@@ -98,4 +123,12 @@ extern void synchronize_rcu(void);
 extern void rcu_register_thread(void);
 extern void rcu_unregister_thread(void);
 
+#ifdef __cplusplus 
+}
+#endif
+
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
+#include <urcu-flavor.h>
+
 #endif /* _URCU_QSBR_H */