#include <urcu/compiler.h>
#include <urcu/arch.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic_arch.h>
#ifdef _LGPL_SOURCE
#define rcu_xchg_pointer _rcu_xchg_pointer
#define rcu_set_pointer _rcu_set_pointer
-/*
- * type *rcu_publish_content(type **ptr, type *new)
- *
- * Exchanges the pointer and waits for quiescent state. The pointer returned
- * can be freed. You are encouraged to use either
- * - rcu_cmpxchg_pointer
- * - rcu_xchg_pointer
- * - rcu_set_pointer
- * with call_rcu(free, ptr) instead to deal with reclamation more efficiently.
- */
-#define rcu_publish_content _rcu_publish_content
-
#else /* !_LGPL_SOURCE */
-extern void *rcu_dereference(void *p);
+extern void *rcu_dereference_sym(void *p);
+#define rcu_dereference(p) \
+ ({ \
+ typeof(p) _________p1 = \
+ rcu_dereference_sym((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) \
+ ({ \
+ typeof(*p) _________pold = (old); \
+ typeof(*p) _________pnew = (_new); \
+ typeof(*p) _________p1 = \
+ rcu_cmpxchg_pointer_sym((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) \
+ ({ \
+ typeof(*p) _________pv = (v); \
+ typeof(*p) _________p1 = \
+ rcu_xchg_pointer_sym((void **)(p), _________pv); \
+ (_________p1); \
+ })
extern void *rcu_set_pointer_sym(void **p, void *v);
-#define rcu_set_pointer(p, v) \
- rcu_set_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))
-
-extern void *rcu_assign_pointer_sym(void **p, void *v);
+#define rcu_set_pointer(p, v) \
+ ({ \
+ typeof(*p) _________pv = (v); \
+ typeof(*p) _________p1 = \
+ rcu_set_pointer_sym((void **)(p), _________pv); \
+ })
#endif /* !_LGPL_SOURCE */