projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename all memory primitives with prefix cmm_
[userspace-rcu.git]
/
urcu-qsbr-static.h
diff --git
a/urcu-qsbr-static.h
b/urcu-qsbr-static.h
index 125301f9b7749c4a93784068eb3f6e320aa156d9..108ef6e7181d58409b2314d0ea0551b211f8e76a 100644
(file)
--- a/
urcu-qsbr-static.h
+++ b/
urcu-qsbr-static.h
@@
-9,7
+9,7
@@
* TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-qsbr.h for linking
* dynamically with the userspace rcu QSBR library.
*
* TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-qsbr.h for linking
* dynamically with the userspace rcu QSBR library.
*
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@
polymtl.ca
>
+ * 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
* Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
*
* This library is free software; you can redistribute it and/or
@@
-155,15
+155,6
@@
static inline void wake_up_gp(void)
}
}
}
}
-#if (BITS_PER_LONG < 64)
-static inline int rcu_gp_ongoing(unsigned long *ctr)
-{
- unsigned long v;
-
- v = LOAD_SHARED(*ctr);
- return v && ((v ^ rcu_gp_ctr) & RCU_GP_CTR);
-}
-#else /* !(BITS_PER_LONG < 64) */
static inline int rcu_gp_ongoing(unsigned long *ctr)
{
unsigned long v;
static inline int rcu_gp_ongoing(unsigned long *ctr)
{
unsigned long v;
@@
-171,7
+162,6
@@
static inline int rcu_gp_ongoing(unsigned long *ctr)
v = LOAD_SHARED(*ctr);
return v && (v != rcu_gp_ctr);
}
v = LOAD_SHARED(*ctr);
return v && (v != rcu_gp_ctr);
}
-#endif /* !(BITS_PER_LONG < 64) */
static inline void _rcu_read_lock(void)
{
static inline void _rcu_read_lock(void)
{
@@
-184,25
+174,27
@@
static inline void _rcu_read_unlock(void)
static inline void _rcu_quiescent_state(void)
{
static inline void _rcu_quiescent_state(void)
{
- smp_mb();
+ cmm_smp_mb();
_STORE_SHARED(rcu_reader.ctr, _LOAD_SHARED(rcu_gp_ctr));
_STORE_SHARED(rcu_reader.ctr, _LOAD_SHARED(rcu_gp_ctr));
-
smp_mb();
/* write rcu_reader.ctr before read futex */
+
cmm_smp_mb();
/* write rcu_reader.ctr before read futex */
wake_up_gp();
wake_up_gp();
- smp_mb();
+
cmm_
smp_mb();
}
static inline void _rcu_thread_offline(void)
{
}
static inline void _rcu_thread_offline(void)
{
- smp_mb();
+
cmm_
smp_mb();
STORE_SHARED(rcu_reader.ctr, 0);
STORE_SHARED(rcu_reader.ctr, 0);
-
smp_mb();
/* write rcu_reader.ctr before read futex */
+
cmm_smp_mb();
/* write rcu_reader.ctr before read futex */
wake_up_gp();
wake_up_gp();
+ cmm_barrier(); /* Ensure the compiler does not reorder us with mutex */
}
static inline void _rcu_thread_online(void)
{
}
static inline void _rcu_thread_online(void)
{
+ cmm_barrier(); /* Ensure the compiler does not reorder us with mutex */
_STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr));
_STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr));
- smp_mb();
+
cmm_
smp_mb();
}
#ifdef __cplusplus
}
#ifdef __cplusplus
This page took
0.028396 seconds
and
4
git commands to generate.