projects
/
urcu.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_
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index c6d7dbc9d83a011a7b7d2885f93460a268da6ea2..9c556aa6bd9d3eeff75ce2c8b857bfb59ca4596b 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-3,7
+3,7
@@
*
* Userspace RCU library
*
*
* Userspace RCU 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
@@
-100,9
+100,9
@@
static void mutex_lock(pthread_mutex_t *mutex)
exit(-1);
}
if (LOAD_SHARED(rcu_reader.need_mb)) {
exit(-1);
}
if (LOAD_SHARED(rcu_reader.need_mb)) {
- smp_mb();
+
cmm_
smp_mb();
_STORE_SHARED(rcu_reader.need_mb, 0);
_STORE_SHARED(rcu_reader.need_mb, 0);
- smp_mb();
+
cmm_
smp_mb();
}
poll(NULL,0,10);
}
}
poll(NULL,0,10);
}
@@
-126,14
+126,14
@@
static void smp_mb_master(int group)
if (likely(has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
else
if (likely(has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
else
- smp_mb();
+
cmm_
smp_mb();
}
#endif
#ifdef RCU_MB
static void smp_mb_master(int group)
{
}
#endif
#ifdef RCU_MB
static void smp_mb_master(int group)
{
- smp_mb();
+
cmm_
smp_mb();
}
#endif
}
#endif
@@
-143,18
+143,18
@@
static void force_mb_all_readers(void)
struct rcu_reader *index;
/*
struct rcu_reader *index;
/*
- * Ask for each threads to execute a smp_mb() so we can consider the
+ * Ask for each threads to execute a
cmm_
smp_mb() so we can consider the
* compiler barriers around rcu read lock as real memory barriers.
*/
if (list_empty(®istry))
return;
/*
* compiler barriers around rcu read lock as real memory barriers.
*/
if (list_empty(®istry))
return;
/*
- * pthread_kill has a smp_mb(). But beware, we assume it performs
+ * pthread_kill has a
cmm_
smp_mb(). But beware, we assume it performs
* a cache flush on architectures with non-coherent cache. Let's play
* a cache flush on architectures with non-coherent cache. Let's play
- * safe and don't assume anything : we use smp_mc() to make sure the
+ * safe and don't assume anything : we use
cmm_
smp_mc() to make sure the
* cache flush is enforced.
*/
* cache flush is enforced.
*/
- list_for_each_entry(index, ®istry,
head
) {
+ list_for_each_entry(index, ®istry,
node
) {
STORE_SHARED(index->need_mb, 1);
pthread_kill(index->tid, SIGRCU);
}
STORE_SHARED(index->need_mb, 1);
pthread_kill(index->tid, SIGRCU);
}
@@
-171,13
+171,13
@@
static void force_mb_all_readers(void)
* relevant bug report. For Linux kernels, we recommend getting
* the Linux Test Project (LTP).
*/
* relevant bug report. For Linux kernels, we recommend getting
* the Linux Test Project (LTP).
*/
- list_for_each_entry(index, ®istry,
head
) {
+ list_for_each_entry(index, ®istry,
node
) {
while (LOAD_SHARED(index->need_mb)) {
pthread_kill(index->tid, SIGRCU);
poll(NULL, 0, 1);
}
}
while (LOAD_SHARED(index->need_mb)) {
pthread_kill(index->tid, SIGRCU);
poll(NULL, 0, 1);
}
}
-
smp_mb();
/* read ->need_mb before ending the barrier */
+
cmm_smp_mb();
/* read ->need_mb before ending the barrier */
}
static void smp_mb_master(int group)
}
static void smp_mb_master(int group)
@@
-213,15
+213,15
@@
void update_counter_and_wait(void)
* while new readers are always accessing data (no progress). Enforce
* compiler-order of store to rcu_gp_ctr before load rcu_reader ctr.
*/
* while new readers are always accessing data (no progress). Enforce
* compiler-order of store to rcu_gp_ctr before load rcu_reader ctr.
*/
- barrier();
+
cmm_
barrier();
/*
*
/*
*
- * Adding a smp_mb() which is _not_ formally required, but makes the
+ * Adding a
cmm_
smp_mb() which is _not_ formally required, but makes the
* model easier to understand. It does not have a big performance impact
* anyway, given this is the write-side.
*/
* model easier to understand. It does not have a big performance impact
* anyway, given this is the write-side.
*/
- smp_mb();
+
cmm_
smp_mb();
/*
* Wait for each thread rcu_reader.ctr count to become 0.
/*
* Wait for each thread rcu_reader.ctr count to become 0.
@@
-234,9
+234,9
@@
void update_counter_and_wait(void)
smp_mb_master(RCU_MB_GROUP);
}
smp_mb_master(RCU_MB_GROUP);
}
- list_for_each_entry_safe(index, tmp, ®istry,
head
) {
+ list_for_each_entry_safe(index, tmp, ®istry,
node
) {
if (!rcu_gp_ongoing(&index->ctr))
if (!rcu_gp_ongoing(&index->ctr))
- list_move(&index->
head
, &qsreaders);
+ list_move(&index->
node
, &qsreaders);
}
#ifndef HAS_INCOHERENT_CACHES
}
#ifndef HAS_INCOHERENT_CACHES
@@
-309,14
+309,14
@@
void synchronize_rcu(void)
* accessing data (no progress). Enforce compiler-order of load
* rcu_reader ctr before store to rcu_gp_ctr.
*/
* accessing data (no progress). Enforce compiler-order of load
* rcu_reader ctr before store to rcu_gp_ctr.
*/
- barrier();
+
cmm_
barrier();
/*
/*
- * Adding a smp_mb() which is _not_ formally required, but makes the
+ * Adding a
cmm_
smp_mb() which is _not_ formally required, but makes the
* model easier to understand. It does not have a big performance impact
* anyway, given this is the write-side.
*/
* model easier to understand. It does not have a big performance impact
* anyway, given this is the write-side.
*/
- smp_mb();
+
cmm_
smp_mb();
/*
* Wait for previous parity to be empty of readers.
/*
* Wait for previous parity to be empty of readers.
@@
-353,14
+353,14
@@
void rcu_register_thread(void)
mutex_lock(&rcu_gp_lock);
rcu_init(); /* In case gcc does not support constructor attribute */
mutex_lock(&rcu_gp_lock);
rcu_init(); /* In case gcc does not support constructor attribute */
- list_add(&rcu_reader.
head
, ®istry);
+ list_add(&rcu_reader.
node
, ®istry);
mutex_unlock(&rcu_gp_lock);
}
void rcu_unregister_thread(void)
{
mutex_lock(&rcu_gp_lock);
mutex_unlock(&rcu_gp_lock);
}
void rcu_unregister_thread(void)
{
mutex_lock(&rcu_gp_lock);
- list_del(&rcu_reader.
head
);
+ list_del(&rcu_reader.
node
);
mutex_unlock(&rcu_gp_lock);
}
mutex_unlock(&rcu_gp_lock);
}
@@
-379,13
+379,13
@@
void rcu_init(void)
static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
{
/*
static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
{
/*
- * Executing this smp_mb() is the only purpose of this signal handler.
- * It punctually promotes
barrier() into
smp_mb() on every thread it is
+ * Executing this
cmm_
smp_mb() is the only purpose of this signal handler.
+ * It punctually promotes
cmm_barrier() into cmm_
smp_mb() on every thread it is
* executed on.
*/
* executed on.
*/
- smp_mb();
+
cmm_
smp_mb();
_STORE_SHARED(rcu_reader.need_mb, 0);
_STORE_SHARED(rcu_reader.need_mb, 0);
- smp_mb();
+
cmm_
smp_mb();
}
/*
}
/*
This page took
0.026591 seconds
and
4
git commands to generate.