Public headers: use SPDX identifiers

[urcu.git] / include / urcu / static / urcu-memb.h

diff --git a/include/urcu/static/urcu-memb.h b/include/urcu/static/urcu-memb.h
index a64efee3f9019b0bc37dbcddebc285c4b5b0fb5b..22e15f623bc91db05455bf004ea36345cd1b8237 100644 (file)
--- a/include/urcu/static/urcu-memb.h
+++ b/include/urcu/static/urcu-memb.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_MEMB_STATIC_H
 #define _URCU_MEMB_STATIC_H
 
 /*
- * urcu-memb-static.h
- *
  * Userspace RCU header.
  *
  * 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.
  */
 
@@ -34,6 +20,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <urcu/debug.h>
 #include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
@@ -42,7 +29,6 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/debug.h>
 #include <urcu/static/urcu-common.h>
 
 #ifdef __cplusplus
@@ -86,9 +72,9 @@ extern DECLARE_URCU_TLS(struct urcu_reader, urcu_memb_reader);
 
 /*
  * Helper for _rcu_read_lock().  The format of urcu_memb_gp.ctr (as well as
- * the per-thread rcu_reader.ctr) has the upper bits containing a count of
- * _rcu_read_lock() nesting, and a lower-order bit that contains either zero
- * or URCU_GP_CTR_PHASE.  The smp_mb_slave() ensures that the accesses in
+ * the per-thread rcu_reader.ctr) has the lower-order bits containing a count of
+ * _rcu_read_lock() nesting, and a single high-order URCU_BP_GP_CTR_PHASE bit
+ * that contains either zero or one.  The smp_mb_slave() ensures that the accesses in
  * _rcu_read_lock() happen before the subsequent read-side critical section.
  */
 static inline void _urcu_memb_read_lock_update(unsigned long tmp)
@@ -114,10 +100,10 @@ static inline void _urcu_memb_read_lock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_memb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_memb_reader).registered);
        cmm_barrier();
        tmp = URCU_TLS(urcu_memb_reader).ctr;
-       urcu_assert((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug((tmp & URCU_GP_CTR_NEST_MASK) != URCU_GP_CTR_NEST_MASK);
        _urcu_memb_read_lock_update(tmp);
 }
 
@@ -141,7 +127,7 @@ static inline void _urcu_memb_read_unlock_update_and_wakeup(unsigned long tmp)
 }
 
 /*
- * Exit an RCU read-side crtical section.  Both this function and its
+ * Exit an RCU read-side critical section.  Both this function and its
  * helper are smaller than 10 lines of code, and are intended to be
  * usable by non-LGPL code, as called out in LGPL.
  */
@@ -149,9 +135,9 @@ static inline void _urcu_memb_read_unlock(void)
 {
        unsigned long tmp;
 
-       urcu_assert(URCU_TLS(urcu_memb_reader).registered);
+       urcu_assert_debug(URCU_TLS(urcu_memb_reader).registered);
        tmp = URCU_TLS(urcu_memb_reader).ctr;
-       urcu_assert(tmp & URCU_GP_CTR_NEST_MASK);
+       urcu_assert_debug(tmp & URCU_GP_CTR_NEST_MASK);
        _urcu_memb_read_unlock_update_and_wakeup(tmp);
        cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }