Install urcu/map/*.h into system

[urcu.git] / urcu-pointer-static.h

diff --git a/urcu-pointer-static.h b/urcu-pointer-static.h
index c2ba80025a2703b7edd69ac017ecc5cb9b57d1bc..b6444860f51143dca1bb3d5eb34e4bbd4a6ce1cd 100644 (file)
--- a/urcu-pointer-static.h
+++ b/urcu-pointer-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-pointer.h for
  * linking dynamically with the userspace rcu library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -32,7 +32,11 @@
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/system.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic_arch.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 /**
  * _rcu_dereference - reads (copy) a RCU-protected pointer to a local variable
@@ -45,7 +49,7 @@
  * Inserts memory barriers on architectures that require them (currently only
  * Alpha) and documents which pointers are protected by RCU.
  *
- * The compiler memory barrier in LOAD_SHARED() ensures that value-speculative
+ * The compiler memory barrier in CMM_LOAD_SHARED() ensures that value-speculative
  * optimizations (e.g. VSS: Value Speculation Scheduling) does not perform the
  * 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.
@@ -58,8 +62,8 @@
  */
 
 #define _rcu_dereference(p)     ({                                     \
-                               typeof(p) _________p1 = LOAD_SHARED(p); \
-                               smp_read_barrier_depends();             \
+                               typeof(p) _________p1 = CMM_LOAD_SHARED(p); \
+                               cmm_smp_read_barrier_depends();         \
                                (_________p1);                          \
                                })
 
@@ -71,12 +75,14 @@
  * should not be freed !).
  */
 
-#define _rcu_cmpxchg_pointer(p, old, _new)             \
-       ({                                              \
-               if (!__builtin_constant_p(_new) ||      \
-                   ((_new) != NULL))                   \
-                       wmb();                          \
-               uatomic_cmpxchg(p, old, _new);          \
+#define _rcu_cmpxchg_pointer(p, old, _new)                             \
+       ({                                                              \
+               typeof(*p) _________pold = (old);                       \
+               typeof(*p) _________pnew = (_new);                      \
+               if (!__builtin_constant_p(_new) ||                      \
+                   ((_new) != NULL))                                   \
+                       cmm_wmb();                                              \
+               uatomic_cmpxchg(p, _________pold, _________pnew);       \
        })
 
 /**
@@ -87,32 +93,21 @@
 
 #define _rcu_xchg_pointer(p, v)                                \
        ({                                              \
+               typeof(*p) _________pv = (v);           \
                if (!__builtin_constant_p(v) ||         \
                    ((v) != NULL))                      \
-                       wmb();                          \
-               uatomic_xchg(p, v);                     \
+                       cmm_wmb();                              \
+               uatomic_xchg(p, _________pv);           \
        })
 
 
 #define _rcu_set_pointer(p, v)                         \
        ({                                              \
+               typeof(*p) _________pv = (v);           \
                if (!__builtin_constant_p(v) ||         \
                    ((v) != NULL))                      \
-                       wmb();                          \
-               STORE_SHARED(*(p), v);                  \
-       })
-
-/*
- * _rcu_publish_content - 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;                                 \
+                       cmm_wmb();                              \
+               uatomic_set(p, _________pv);            \
        })
 
 /**
@@ -130,4 +125,8 @@
 
 #define _rcu_assign_pointer(p, v)      _rcu_set_pointer(&(p), v)
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_POINTER_STATIC_H */