X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Fpointer.h;h=9dc0d3eaa5f4c6177fc503449153cd08f78267ec;hb=d18544842bdfbf2cba6c194a8e8d305ddf5e295e;hp=891daed2994ba8a58c0b7f1bdfe10d886d37f91c;hpb=380f4b19052944e5f9990ba02b6fc6117ce446b4;p=userspace-rcu.git

diff --git a/include/urcu/static/pointer.h b/include/urcu/static/pointer.h
index 891daed..9dc0d3e 100644
--- a/include/urcu/static/pointer.h
+++ b/include/urcu/static/pointer.h
@@ -1,31 +1,17 @@
+// SPDX-FileCopyrightText: 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+// SPDX-FileCopyrightText: 2009 Paul E. McKenney, IBM Corporation.
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 #ifndef _URCU_POINTER_STATIC_H
 #define _URCU_POINTER_STATIC_H
 
 /*
- * urcu/static/pointer.h
- *
  * Userspace RCU header. Operations on pointers.
  *
  * TO BE INCLUDED ONLY IN CODE THAT IS TO BE RECOMPILED ON EACH LIBURCU
  * RELEASE. See urcu.h for linking dynamically with the userspace rcu library.
  *
- * 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
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
@@ -61,6 +47,10 @@ extern "C" {
  * optimizations are taken care of by the "memory_order_consume" atomic
  * load.
  *
+ * Use the gcc __atomic_load() rather than C11/C++11 atomic load
+ * explicit because the pointer used as input argument is a pointer,
+ * not an _Atomic type as required by C11/C++11.
+ *
  * By defining URCU_DEREFERENCE_USE_VOLATILE, the user requires use of
  * volatile access to implement rcu_dereference rather than
  * memory_order_consume load from the C11/C++11 standards.
@@ -80,34 +70,20 @@ extern "C" {
  * expanded directly in non-LGPL code.
  */
 
-#ifdef URCU_DEREFERENCE_USE_VOLATILE
-# define __rcu_dereference(p)	CMM_LOAD_SHARED(p)
-#else
-# if defined (__cplusplus)
-#  if __cplusplus >= 201103L
-#   include <atomic>
-#   define __rcu_dereference(p)	((std::atomic<__typeof__(p)>)(p)).load(std::memory_order_consume)
-#  else
-#   define __rcu_dereference(p)	CMM_LOAD_SHARED(x)
-#  endif
-# else
-#  if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
-#   include <stdatomic.h>
-#   define __rcu_dereference(p)	atomic_load_explicit(&(p), memory_order_consume)
-#  else
-#   define __rcu_dereference(p)	CMM_LOAD_SHARED(p)
-#  endif
-# endif
+#if !defined (URCU_DEREFERENCE_USE_VOLATILE) &&		\
+	((defined (__cplusplus) && __cplusplus >= 201103L) ||	\
+	(defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L))
+# define __URCU_DEREFERENCE_USE_ATOMIC_CONSUME
 #endif
 
-#define _rcu_dereference(p)						\
-				__extension__				\
-				({					\
-				__typeof__(p) _________p1 = __rcu_dereference(p); \
-				cmm_smp_read_barrier_depends();		\
-				(_________p1);				\
-				})
-
+/*
+ * If p is const (the pointer itself, not what it points to), using
+ * __typeof__(p) would declare a const variable, leading to
+ * -Wincompatible-pointer-types errors.  Using the statement expression
+ * makes it an rvalue and gets rid of the const-ness.
+ */
+# define _rcu_dereference(p)			\
+	uatomic_load(&(p), CMM_CONSUME)
 /**
  * _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
@@ -115,7 +91,7 @@ extern "C" {
  * using synchronize_rcu(). If fails (unexpected value), returns old (which
  * should not be freed !).
  *
- * uatomic_cmpxchg() acts as both release and acquire barriers.
+ * uatomic_cmpxchg() acts as both release and acquire barriers on success.
  *
  * This macro is less than 10 lines long.  The intent is that this macro
  * meets the 10-line criterion in LGPL, allowing this function to be
@@ -126,8 +102,9 @@ extern "C" {
 	({								\
 		__typeof__(*p) _________pold = (old);			\
 		__typeof__(*p) _________pnew = (_new);			\
-		uatomic_cmpxchg(p, _________pold, _________pnew);	\
-	})
+		uatomic_cmpxchg_mo(p, _________pold, _________pnew,	\
+				   CMM_SEQ_CST, CMM_RELAXED);		\
+	});
 
 /**
  * _rcu_xchg_pointer - same as rcu_assign_pointer, but returns the previous
@@ -144,17 +121,17 @@ extern "C" {
 	__extension__					\
 	({						\
 		__typeof__(*p) _________pv = (v);	\
-		uatomic_xchg(p, _________pv);		\
+		uatomic_xchg_mo(p, _________pv,		\
+				CMM_SEQ_CST);		\
 	})
 
 
-#define _rcu_set_pointer(p, v)				\
-	do {						\
-		__typeof__(*p) _________pv = (v);	\
-		if (!__builtin_constant_p(v) || 	\
-		    ((v) != NULL))			\
-			cmm_wmb();				\
-		uatomic_set(p, _________pv);		\
+#define _rcu_set_pointer(p, v)						\
+	do {								\
+		__typeof__(*p) _________pv = (v);			\
+		uatomic_store(p, _________pv,				\
+			__builtin_constant_p(v) && (v) == NULL ?	\
+			CMM_RELAXED : CMM_RELEASE);			\
 	} while (0)
 
 /**