X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.h;h=7a265dc5f91b1899ef35a73d31eb7782d4d2e5a3;hp=fdf885c71113d2f4add67ba4354d00bfd20fcfa7;hb=67ecffc0f530a7b5c4dd5111ea7dd3213da8eb91;hpb=5e77fc1f94c3572fca067d37667d74f8165e2434

diff --git a/urcu-bp.h b/urcu-bp.h
index fdf885c..7a265dc 100644
--- a/urcu-bp.h
+++ b/urcu-bp.h
@@ -37,16 +37,11 @@
 #include <stdlib.h>
 #include <pthread.h>
 
-/*
- * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers.
- */
-#include <urcu-pointer.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "urcu-bp-map.h"
+#include <urcu/map/urcu-bp.h>
 
 /*
  * Important !
@@ -56,9 +51,15 @@ extern "C" {
  * rcu_unregister_thread() should be called before the thread exits.
  */
 
+/*
+ * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer
+ * publication headers.
+ */
+#include <urcu-pointer.h>
+
 #ifdef _LGPL_SOURCE
 
-#include <urcu-bp-static.h>
+#include <urcu/static/urcu-bp.h>
 
 /*
  * Mappings for static use of the userspace RCU library.
@@ -71,18 +72,69 @@ extern "C" {
  *
  * Mark the beginning and end of a read-side critical section.
  */
-#define rcu_read_lock_bp()		_rcu_read_lock()
-#define rcu_read_unlock_bp()		_rcu_read_unlock()
+#define rcu_read_lock_bp		_rcu_read_lock
+#define rcu_read_unlock_bp		_rcu_read_unlock
+#define rcu_read_ongoing_bp		_rcu_read_ongoing
+
+#define rcu_dereference_bp		rcu_dereference
+#define rcu_cmpxchg_pointer_bp		rcu_cmpxchg_pointer
+#define rcu_xchg_pointer_bp		rcu_xchg_pointer
+#define rcu_set_pointer_bp		rcu_set_pointer
 
 #else /* !_LGPL_SOURCE */
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
- * See LGPL-only urcu-pointer-static.h for documentation.
+ * See LGPL-only urcu/static/urcu-pointer.h for documentation.
  */
 
 extern void rcu_read_lock(void);
 extern void rcu_read_unlock(void);
+extern int rcu_read_ongoing(void);
+
+extern void *rcu_dereference_sym_bp(void *p);
+#define rcu_dereference_bp(p)						     \
+	__extension__							     \
+	({								     \
+		__typeof__(p) _________p1 = URCU_FORCE_CAST(__typeof__(p),   \
+			rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
+		(_________p1);						     \
+	})
+
+extern void *rcu_cmpxchg_pointer_sym_bp(void **p, void *old, void *_new);
+#define rcu_cmpxchg_pointer_bp(p, old, _new)				     \
+	__extension__							     \
+	({								     \
+		__typeof__(*(p)) _________pold = (old);			     \
+		__typeof__(*(p)) _________pnew = (_new);		     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
+			rcu_cmpxchg_pointer_sym_bp(URCU_FORCE_CAST(void **, p), \
+						_________pold,		     \
+						_________pnew));	     \
+		(_________p1);						     \
+	})
+
+extern void *rcu_xchg_pointer_sym_bp(void **p, void *v);
+#define rcu_xchg_pointer_bp(p, v)					     \
+	__extension__							     \
+	({								     \
+		__typeof__(*(p)) _________pv = (v);			     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)),\
+			rcu_xchg_pointer_sym_bp(URCU_FORCE_CAST(void **, p), \
+					     _________pv));		     \
+		(_________p1);						     \
+	})
+
+extern void *rcu_set_pointer_sym_bp(void **p, void *v);
+#define rcu_set_pointer_bp(p, v)					     \
+	__extension__							     \
+	({								     \
+		__typeof__(*(p)) _________pv = (v);			     \
+		__typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
+			rcu_set_pointer_sym_bp(URCU_FORCE_CAST(void **, p),  \
+					    _________pv));		     \
+		(_________p1);						     \
+	})
 
 #endif /* !_LGPL_SOURCE */
 
@@ -113,10 +165,27 @@ static inline void rcu_init(void)
 {
 }
 
-#ifdef __cplusplus 
+/*
+ * Q.S. reporting are no-ops for these URCU flavors.
+ */
+static inline void rcu_quiescent_state(void)
+{
+}
+
+static inline void rcu_thread_offline(void)
+{
+}
+
+static inline void rcu_thread_online(void)
+{
+}
+
+#ifdef __cplusplus
 }
 #endif
 
-#include "urcu-call-rcu.h"
+#include <urcu-call-rcu.h>
+#include <urcu-defer.h>
+#include <urcu-flavor.h>
 
 #endif /* _URCU_BP_H */