Cleanup: remove trailing whitespaces at EOL

[urcu.git] / urcu-pointer.h

diff --git a/urcu-pointer.h b/urcu-pointer.h
index 0a3524fa1e0b7b65cd6ec8154c9a45b2bf36abb5..dc1a0dac60718b15d1f8eb844b3feca315dd4068 100644 (file)
--- a/urcu-pointer.h
+++ b/urcu-pointer.h
@@ -6,7 +6,7 @@
  *
  * Userspace RCU header. Operations on pointers.
  *
- * 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
@@ -28,11 +28,15 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic.h>
 
-#ifdef _LGPL_SOURCE
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include <urcu-pointer-static.h>
+#if defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)
+
+#include <urcu/static/urcu-pointer.h>
 
 /*
  * rcu_dereference(ptr)
@@ -43,9 +47,9 @@
 #define rcu_dereference                _rcu_dereference
 
 /*
- * rcu_cmpxchg_pointer(type **ptr, type *new, type *old)
+ * type *rcu_cmpxchg_pointer(type **ptr, type *new, type *old)
  * type *rcu_xchg_pointer(type **ptr, type *new)
- * type *rcu_set_pointer(type **ptr, type *new)
+ * void rcu_set_pointer(type **ptr, type *new)
  *
  * RCU pointer updates.
  * @ptr: address of the pointer to modify
@@ -58,28 +62,59 @@
 #define rcu_xchg_pointer       _rcu_xchg_pointer
 #define rcu_set_pointer                _rcu_set_pointer
 
-#else /* !_LGPL_SOURCE */
+#else /* !(defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)) */
 
-extern void *rcu_dereference(void *p);
+extern void *rcu_dereference_sym(void *p);
+#define rcu_dereference(p)                                                  \
+       __extension__                                                        \
+       ({                                                                   \
+               __typeof__(p) _________p1 =     URCU_FORCE_CAST(__typeof__(p), \
+                       rcu_dereference_sym(URCU_FORCE_CAST(void *, p)));    \
+               (_________p1);                                               \
+       })
 
 extern void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new);
-#define rcu_cmpxchg_pointer(p, old, _new)              \
-       rcu_cmpxchg_pointer_sym((void **)(p), (old), (_new))
+#define rcu_cmpxchg_pointer(p, old, _new)                                   \
+       __extension__                                                        \
+       ({                                                                   \
+               __typeof__(*(p)) _________pold = (old);                      \
+               __typeof__(*(p)) _________pnew = (_new);                     \
+               __typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
+                       rcu_cmpxchg_pointer_sym(URCU_FORCE_CAST(void **, p), \
+                                               _________pold,               \
+                                               _________pnew));             \
+               (_________p1);                                               \
+       })
 
 extern void *rcu_xchg_pointer_sym(void **p, void *v);
-#define rcu_xchg_pointer(p, v)                         \
-       rcu_xchg_pointer_sym((void **)(p), (v))
+#define rcu_xchg_pointer(p, v)                                              \
+       __extension__                                                        \
+       ({                                                                   \
+               __typeof__(*(p)) _________pv = (v);                          \
+               __typeof__(*(p)) _________p1 = URCU_FORCE_CAST(__typeof__(*(p)), \
+                       rcu_xchg_pointer_sym(URCU_FORCE_CAST(void **, p),    \
+                                            _________pv));                  \
+               (_________p1);                                               \
+       })
 
+/*
+ * Note: rcu_set_pointer_sym returns @v because we don't want to break
+ * the ABI. At the API level, rcu_set_pointer() now returns void. Use of
+ * the return value is therefore deprecated, and will cause a build
+ * error.
+ */
 extern void *rcu_set_pointer_sym(void **p, void *v);
-#define rcu_set_pointer(p, v)                          \
-       rcu_set_pointer_sym((void **)(p), (v))
+#define rcu_set_pointer(p, v)                                               \
+       do {                                                                 \
+               __typeof__(*(p)) _________pv = (v);                          \
+               (void) rcu_set_pointer_sym(URCU_FORCE_CAST(void **, p),      \
+                                           _________pv);                    \
+       } while (0)
 
-extern void *rcu_assign_pointer_sym(void **p, void *v);
-
-#endif /* !_LGPL_SOURCE */
+#endif /* !(defined(_LGPL_SOURCE) || defined(URCU_INLINE_SMALL_FUNCTIONS)) */
 
 /*
- * rcu_assign_pointer(type *ptr, type *new)
+ * void rcu_assign_pointer(type *ptr, type *new)
  *
  * Same as rcu_set_pointer, but takes the pointer to assign to rather than its
  * address as first parameter. Provided for compatibility with the Linux kernel
@@ -87,4 +122,8 @@ extern void *rcu_assign_pointer_sym(void **p, void *v);
  */
 #define rcu_assign_pointer(p, v)       rcu_set_pointer((&p), (v))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _URCU_POINTER_H */