X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=72d35957e802c42733ed415d871a9c4aa54a74ac;hp=8735c7fd3fe081f36e86af5cc6292e827ff8802b;hb=36bc70a84250927ba68d5096a0a9740aec157f9b;hpb=bd1a5e15ab6d3e42be1af622bbc53a30f5ae3769

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 8735c7f..72d3595 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -38,61 +38,14 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
+#include <urcu/system.h>
+#include <urcu/uatomic_arch.h>
 #include <urcu/list.h>
+#include <urcu/urcu-futex.h>
 
-/*
- * Identify a shared load. A smp_rmc() or smp_mc() should come before the load.
- */
-#define _LOAD_SHARED(p)	       ACCESS_ONCE(p)
-
-/*
- * Load a data from shared memory, doing a cache flush if required.
- */
-#define LOAD_SHARED(p)			\
-	({				\
-		smp_rmc();		\
-		_LOAD_SHARED(p);	\
-	})
-
-/*
- * Identify a shared store. A smp_wmc() or smp_mc() should follow the store.
- */
-#define _STORE_SHARED(x, v)	({ ACCESS_ONCE(x) = (v); })
-
-/*
- * Store v into x, where x is located in shared memory. Performs the required
- * cache flush after writing. Returns v.
- */
-#define STORE_SHARED(x, v)		\
-	({				\
-		_STORE_SHARED(x, v);	\
-		smp_wmc();		\
-		(v);			\
-	})
-
-/**
- * _rcu_dereference - reads (copy) a RCU-protected pointer to a local variable
- * into a RCU read-side critical section. The pointer can later be safely
- * dereferenced within the critical section.
- *
- * This ensures that the pointer copy is invariant thorough the whole critical
- * section.
- *
- * Inserts memory barriers on architectures that require them (currently only
- * Alpha) and documents which pointers are protected by RCU.
- *
- * Should match rcu_assign_pointer() or rcu_xchg_pointer().
- */
-
-#define _rcu_dereference(p)     ({					\
-				typeof(p) _________p1 = LOAD_SHARED(p); \
-				smp_read_barrier_depends();		\
-				(_________p1);				\
-				})
-
-#define futex(...)		syscall(__NR_futex, __VA_ARGS__)
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 /*
  * This code section can only be included in LGPL 2.1 compatible source code.
@@ -202,7 +155,7 @@ static inline void wake_up_gp(void)
 {
 	if (unlikely(uatomic_read(&gp_futex) == -1)) {
 		uatomic_set(&gp_futex, 0);
-		futex(&gp_futex, FUTEX_WAKE, 1,
+		futex_noasync(&gp_futex, FUTEX_WAKE, 1,
 		      NULL, NULL, 0);
 	}
 }
@@ -261,67 +214,8 @@ static inline void _rcu_thread_online(void)
 	smp_mb();
 }
 
-/**
- * _rcu_assign_pointer - assign (publicize) a pointer to a new data structure
- * meant to be read by RCU read-side critical sections. Returns the assigned
- * value.
- *
- * Documents which pointers will be dereferenced by RCU read-side critical
- * sections and adds the required memory barriers on architectures requiring
- * them. It also makes sure the compiler does not reorder code initializing the
- * data structure before its publication.
- *
- * Should match rcu_dereference_pointer().
- */
-
-#define _rcu_assign_pointer(p, v)			\
-	({						\
-		if (!__builtin_constant_p(v) || 	\
-		    ((v) != NULL))			\
-			wmb();				\
-		STORE_SHARED(p, v);			\
-	})
-
-/**
- * _rcu_cmpxchg_pointer - same as rcu_assign_pointer, but tests if the pointer
- * is as expected by "old". If succeeds, returns the previous pointer to the
- * data structure, which can be safely freed after waiting for a quiescent state
- * using synchronize_rcu(). If fails (unexpected value), returns old (which
- * should not be freed !).
- */
-
-#define _rcu_cmpxchg_pointer(p, old, _new)		\
-	({						\
-		if (!__builtin_constant_p(_new) ||	\
-		    ((_new) != NULL))			\
-			wmb();				\
-		uatomic_cmpxchg(p, old, _new);		\
-	})
-
-/**
- * _rcu_xchg_pointer - same as rcu_assign_pointer, but returns the previous
- * pointer to the data structure, which can be safely freed after waiting for a
- * quiescent state using synchronize_rcu().
- */
-
-#define _rcu_xchg_pointer(p, v)				\
-	({						\
-		if (!__builtin_constant_p(v) ||		\
-		    ((v) != NULL))			\
-			wmb();				\
-		uatomic_xchg(p, v);			\
-	})
-
-/*
- * Exchanges the pointer and waits for quiescent state.
- * The pointer returned can be freed.
- */
-#define _rcu_publish_content(p, v)			\
-	({						\
-		void *oldptr;				\
-		oldptr = _rcu_xchg_pointer(p, v);	\
-		synchronize_rcu();			\
-		oldptr;					\
-	})
+#ifdef __cplusplus 
+}
+#endif
 
 #endif /* _URCU_QSBR_STATIC_H */