projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add `urcu_posix_assert()` as `assert()` replacement
[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..c8d102f1c2653e5390890d1decc124c86d53230b 100644
(file)
--- a/
include/urcu/static/urcu-memb.h
+++ b/
include/urcu/static/urcu-memb.h
@@
-34,6
+34,7
@@
#include <unistd.h>
#include <stdint.h>
#include <unistd.h>
#include <stdint.h>
+#include <urcu/debug.h>
#include <urcu/config.h>
#include <urcu/compiler.h>
#include <urcu/arch.h>
#include <urcu/config.h>
#include <urcu/compiler.h>
#include <urcu/arch.h>
@@
-42,7
+43,6
@@
#include <urcu/list.h>
#include <urcu/futex.h>
#include <urcu/tls-compat.h>
#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
#include <urcu/static/urcu-common.h>
#ifdef __cplusplus
@@
-114,10
+114,10
@@
static inline void _urcu_memb_read_lock(void)
{
unsigned long tmp;
{
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;
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);
}
_urcu_memb_read_lock_update(tmp);
}
@@
-141,7
+141,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 cr
i
tical 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.
*/
* 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
+149,9
@@
static inline void _urcu_memb_read_unlock(void)
{
unsigned long tmp;
{
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;
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 */
}
_urcu_memb_read_unlock_update_and_wakeup(tmp);
cmm_barrier(); /* Ensure the compiler does not reorder us with mutex */
}
This page took
0.027212 seconds
and
4
git commands to generate.