fix: handle EINTR correctly in get_cpu_mask_from_sysfs

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

diff --git a/include/urcu/static/pointer.h b/include/urcu/static/pointer.h
index 465a6101bcb12b5708ccfb90334b00969bf6b0c3..9dc0d3eaa5f4c6177fc503449153cd08f78267ec 100644 (file)
--- 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.
  */
 
@@ -93,23 +79,11 @@ extern "C" {
 /*
  * 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 `+ 0` makes it an rvalue and
- * gets rid of the const-ness.
+ * -Wincompatible-pointer-types errors.  Using the statement expression
+ * makes it an rvalue and gets rid of the const-ness.
  */
-#ifdef __URCU_DEREFERENCE_USE_ATOMIC_CONSUME
-# define _rcu_dereference(p) __extension__ ({                                          \
-                               __typeof__(p + 0) _________p1;                          \
-                               __atomic_load(&(p), &_________p1, __ATOMIC_CONSUME);    \
-                               (_________p1);                                          \
-                       })
-#else
-# define _rcu_dereference(p) __extension__ ({                                          \
-                               __typeof__(p) _________p1 = CMM_LOAD_SHARED(p);         \
-                               cmm_smp_read_barrier_depends();                         \
-                               (_________p1);                                          \
-                       })
-#endif
-
+# 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
@@ -117,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
@@ -128,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
@@ -146,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)
 
 /**