projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
URCU: rename light/heavy barriers to slave/master
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index ffdab3c2fc1eacbad2c4e73f5e89e83261fdb8d5..5e8c6127a8c2f6413d56e95f66eba8c827595c85 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-121,7
+121,7
@@
static void mutex_unlock(pthread_mutex_t *mutex)
}
#ifdef RCU_MEMBARRIER
}
#ifdef RCU_MEMBARRIER
-static void smp_mb_
heavy(void
)
+static void smp_mb_
master(int group
)
{
if (likely(has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
{
if (likely(has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
@@
-131,7
+131,7
@@
static void smp_mb_heavy(void)
#endif
#ifdef RCU_MB
#endif
#ifdef RCU_MB
-static void smp_mb_
heavy(void
)
+static void smp_mb_
master(int group
)
{
smp_mb();
}
{
smp_mb();
}
@@
-181,7
+181,7
@@
static void force_mb_all_readers(void)
smp_mb(); /* read ->need_mb before ending the barrier */
}
smp_mb(); /* read ->need_mb before ending the barrier */
}
-static void smp_mb_
heavy(void
)
+static void smp_mb_
master(int group
)
{
force_mb_all_readers();
}
{
force_mb_all_readers();
}
@@
-193,7
+193,7
@@
static void smp_mb_heavy(void)
static void wait_gp(void)
{
/* Read reader_gp before read futex */
static void wait_gp(void)
{
/* Read reader_gp before read futex */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
if (uatomic_read(&gp_futex) == -1)
futex_async(&gp_futex, FUTEX_WAIT, -1,
NULL, NULL, 0);
if (uatomic_read(&gp_futex) == -1)
futex_async(&gp_futex, FUTEX_WAIT, -1,
NULL, NULL, 0);
@@
-230,7
+230,7
@@
void update_counter_and_wait(void)
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
uatomic_dec(&gp_futex);
/* Write futex before read reader_gp */
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
uatomic_dec(&gp_futex);
/* Write futex before read reader_gp */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
}
list_for_each_entry_safe(index, tmp, ®istry, head) {
}
list_for_each_entry_safe(index, tmp, ®istry, head) {
@@
-242,7
+242,7
@@
void update_counter_and_wait(void)
if (list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
if (list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
uatomic_set(&gp_futex, 0);
}
break;
uatomic_set(&gp_futex, 0);
}
break;
@@
-260,7
+260,7
@@
void update_counter_and_wait(void)
if (list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
if (list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
uatomic_set(&gp_futex, 0);
}
break;
uatomic_set(&gp_futex, 0);
}
break;
@@
-270,7
+270,7
@@
void update_counter_and_wait(void)
wait_gp();
break; /* only escape switch */
case KICK_READER_LOOPS:
wait_gp();
break; /* only escape switch */
case KICK_READER_LOOPS:
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
wait_loops = 0;
break; /* only escape switch */
default:
wait_loops = 0;
break; /* only escape switch */
default:
@@
-294,7
+294,7
@@
void synchronize_rcu(void)
* where new ptr points to. Must be done within rcu_gp_lock because it
* iterates on reader threads.*/
/* Write new ptr before changing the qparity */
* where new ptr points to. Must be done within rcu_gp_lock because it
* iterates on reader threads.*/
/* Write new ptr before changing the qparity */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
/*
* Wait for previous parity to be empty of readers.
/*
* Wait for previous parity to be empty of readers.
@@
-324,7
+324,7
@@
void synchronize_rcu(void)
/* Finish waiting for reader threads before letting the old ptr being
* freed. Must be done within rcu_gp_lock because it iterates on reader
* threads. */
/* Finish waiting for reader threads before letting the old ptr being
* freed. Must be done within rcu_gp_lock because it iterates on reader
* threads. */
- smp_mb_
heavy(
);
+ smp_mb_
master(RCU_MB_GROUP
);
out:
mutex_unlock(&rcu_gp_lock);
}
out:
mutex_unlock(&rcu_gp_lock);
}
This page took
0.024225 seconds
and
4
git commands to generate.