projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove leftover manual pthread detection
[userspace-rcu.git]
/
urcu
/
static
/
urcu.h
diff --git
a/urcu/static/urcu.h
b/urcu/static/urcu.h
index fbba46cde9afdc6bff0c4b337a22afc78d40fea7..9082af71a92c443dd0efe8be74d879c55dd56ddd 100644
(file)
--- a/
urcu/static/urcu.h
+++ b/
urcu/static/urcu.h
@@
-46,7
+46,7
@@
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
/* Default is RCU_MEMBARRIER */
#if !defined(RCU_MEMBARRIER) && !defined(RCU_MB) && !defined(RCU_SIGNAL)
/* Default is RCU_MEMBARRIER */
#if !defined(RCU_MEMBARRIER) && !defined(RCU_MB) && !defined(RCU_SIGNAL)
@@
-81,9
+81,6
@@
enum rcu_state {
};
/*
};
/*
- * RCU memory barrier broadcast group. Currently, only broadcast to all process
- * threads is supported (group 0).
- *
* Slave barriers are only guaranteed to be ordered wrt master barriers.
*
* The pair ordering is detailed as (O: ordered, X: not ordered) :
* Slave barriers are only guaranteed to be ordered wrt master barriers.
*
* The pair ordering is detailed as (O: ordered, X: not ordered) :
@@
-92,13
+89,10
@@
enum rcu_state {
* master O O
*/
* master O O
*/
-#define MB_GROUP_ALL 0
-#define RCU_MB_GROUP MB_GROUP_ALL
-
#ifdef RCU_MEMBARRIER
extern int rcu_has_sys_membarrier;
#ifdef RCU_MEMBARRIER
extern int rcu_has_sys_membarrier;
-static inline void smp_mb_slave(
int group
)
+static inline void smp_mb_slave(
void
)
{
if (caa_likely(rcu_has_sys_membarrier))
cmm_barrier();
{
if (caa_likely(rcu_has_sys_membarrier))
cmm_barrier();
@@
-108,14
+102,14
@@
static inline void smp_mb_slave(int group)
#endif
#ifdef RCU_MB
#endif
#ifdef RCU_MB
-static inline void smp_mb_slave(
int group
)
+static inline void smp_mb_slave(
void
)
{
cmm_smp_mb();
}
#endif
#ifdef RCU_SIGNAL
{
cmm_smp_mb();
}
#endif
#ifdef RCU_SIGNAL
-static inline void smp_mb_slave(
int group
)
+static inline void smp_mb_slave(
void
)
{
cmm_barrier();
}
{
cmm_barrier();
}
@@
-202,7
+196,7
@@
static inline void _rcu_read_lock_update(unsigned long tmp)
{
if (caa_likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, _CMM_LOAD_SHARED(rcu_gp.ctr));
{
if (caa_likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, _CMM_LOAD_SHARED(rcu_gp.ctr));
- smp_mb_slave(
RCU_MB_GROUP
);
+ smp_mb_slave();
} else
_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp + RCU_GP_COUNT);
}
} else
_CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr, tmp + RCU_GP_COUNT);
}
@@
-224,6
+218,7
@@
static inline void _rcu_read_lock(void)
urcu_assert(URCU_TLS(rcu_reader).registered);
cmm_barrier();
tmp = URCU_TLS(rcu_reader).ctr;
urcu_assert(URCU_TLS(rcu_reader).registered);
cmm_barrier();
tmp = URCU_TLS(rcu_reader).ctr;
+ urcu_assert((tmp & RCU_GP_CTR_NEST_MASK) != RCU_GP_CTR_NEST_MASK);
_rcu_read_lock_update(tmp);
}
_rcu_read_lock_update(tmp);
}
@@
-238,12
+233,12
@@
static inline void _rcu_read_lock(void)
static inline void _rcu_read_unlock_update_and_wakeup(unsigned long tmp)
{
if (caa_likely((tmp & RCU_GP_CTR_NEST_MASK) == RCU_GP_COUNT)) {
static inline void _rcu_read_unlock_update_and_wakeup(unsigned long tmp)
{
if (caa_likely((tmp & RCU_GP_CTR_NEST_MASK) == RCU_GP_COUNT)) {
- smp_mb_slave(
RCU_MB_GROUP
);
- _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr,
URCU_TLS(rcu_reader).ctr
- RCU_GP_COUNT);
- smp_mb_slave(
RCU_MB_GROUP
);
+ smp_mb_slave();
+ _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr,
tmp
- RCU_GP_COUNT);
+ smp_mb_slave();
wake_up_gp();
} else
wake_up_gp();
} else
- _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr,
URCU_TLS(rcu_reader).ctr
- RCU_GP_COUNT);
+ _CMM_STORE_SHARED(URCU_TLS(rcu_reader).ctr,
tmp
- RCU_GP_COUNT);
}
/*
}
/*
@@
-257,6
+252,7
@@
static inline void _rcu_read_unlock(void)
urcu_assert(URCU_TLS(rcu_reader).registered);
tmp = URCU_TLS(rcu_reader).ctr;
urcu_assert(URCU_TLS(rcu_reader).registered);
tmp = URCU_TLS(rcu_reader).ctr;
+ urcu_assert(tmp & RCU_GP_CTR_NEST_MASK);
_rcu_read_unlock_update_and_wakeup(tmp);
cmm_barrier(); /* Ensure the compiler does not reorder us with mutex */
}
_rcu_read_unlock_update_and_wakeup(tmp);
cmm_barrier(); /* Ensure the compiler does not reorder us with mutex */
}
This page took
0.025955 seconds
and
4
git commands to generate.