projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: rcu_barrier(): uninitialized futex field
[userspace-rcu.git]
/
urcu-qsbr.c
diff --git
a/urcu-qsbr.c
b/urcu-qsbr.c
index 5bdf259492156681e23e873d79286b5ca55093fb..d8ae1c1257517645e22ef143b8b23950ff330d1b 100644
(file)
--- a/
urcu-qsbr.c
+++ b/
urcu-qsbr.c
@@
-53,7
+53,7
@@
void __attribute__((destructor)) rcu_exit(void);
static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
void __attribute__((destructor)) rcu_exit(void);
static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
-struct
u
rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
+struct rcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
/*
* Active attempts to check for reader Q.S. before calling futex().
/*
* Active attempts to check for reader Q.S. before calling futex().
@@
-64,11
+64,11
@@
struct urcu_gp rcu_gp = { .ctr = RCU_GP_ONLINE };
* Written to only by each individual reader. Read by both the reader and the
* writers.
*/
* Written to only by each individual reader. Read by both the reader and the
* writers.
*/
-
DEFINE_URCU_TLS
(struct rcu_reader, rcu_reader);
+
__DEFINE_URCU_TLS_GLOBAL
(struct rcu_reader, rcu_reader);
#ifdef DEBUG_YIELD
unsigned int rcu_yield_active;
#ifdef DEBUG_YIELD
unsigned int rcu_yield_active;
-
DEFINE_URCU_TLS
(unsigned int, rcu_rand_yield);
+
__DEFINE_URCU_TLS_GLOBAL
(unsigned int, rcu_rand_yield);
#endif
static CDS_LIST_HEAD(registry);
#endif
static CDS_LIST_HEAD(registry);
@@
-121,7
+121,7
@@
static void wait_for_readers(struct cds_list_head *input_readers,
struct cds_list_head *cur_snap_readers,
struct cds_list_head *qsreaders)
{
struct cds_list_head *cur_snap_readers,
struct cds_list_head *qsreaders)
{
- int wait_loops = 0;
+
unsigned
int wait_loops = 0;
struct rcu_reader *index, *tmp;
/*
struct rcu_reader *index, *tmp;
/*
@@
-130,7
+130,8
@@
static void wait_for_readers(struct cds_list_head *input_readers,
* current rcu_gp.ctr value.
*/
for (;;) {
* current rcu_gp.ctr value.
*/
for (;;) {
- wait_loops++;
+ if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS)
+ wait_loops++;
if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
uatomic_set(&rcu_gp.futex, -1);
/*
if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
uatomic_set(&rcu_gp.futex, -1);
/*
This page took
0.050475 seconds
and
4
git commands to generate.