projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow taking address of rcu_read_lock() and rcu_read_unlock()
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index b4a5a7db948b8d57a03960747c5257d9631b1c7c..4ee9e3bebbefbaf30beb078c264b3bc61cf4e897 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-33,6
+33,8
@@
#include <errno.h>
#include <poll.h>
#include <errno.h>
#include <poll.h>
+#include "urcu-map.h"
+
#include "urcu-static.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
#include "urcu-static.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
@@
-80,7
+82,7
@@
unsigned int yield_active;
unsigned int __thread rand_yield;
#endif
unsigned int __thread rand_yield;
#endif
-static LIST_HEAD(registry);
+static
CDS_
LIST_HEAD(registry);
static void mutex_lock(pthread_mutex_t *mutex)
{
static void mutex_lock(pthread_mutex_t *mutex)
{
@@
-99,9
+101,9
@@
static void mutex_lock(pthread_mutex_t *mutex)
perror("Error in pthread mutex lock");
exit(-1);
}
perror("Error in pthread mutex lock");
exit(-1);
}
- if (C
AA
_LOAD_SHARED(rcu_reader.need_mb)) {
+ if (C
MM
_LOAD_SHARED(rcu_reader.need_mb)) {
cmm_smp_mb();
cmm_smp_mb();
- _C
AA
_STORE_SHARED(rcu_reader.need_mb, 0);
+ _C
MM
_STORE_SHARED(rcu_reader.need_mb, 0);
cmm_smp_mb();
}
poll(NULL,0,10);
cmm_smp_mb();
}
poll(NULL,0,10);
@@
-146,7
+148,7
@@
static void force_mb_all_readers(void)
* 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.
*/
* 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))
+ if (
cds_
list_empty(®istry))
return;
/*
* pthread_kill has a cmm_smp_mb(). But beware, we assume it performs
return;
/*
* pthread_kill has a cmm_smp_mb(). But beware, we assume it performs
@@
-154,8
+156,8
@@
static void force_mb_all_readers(void)
* safe and don't assume anything : we use cmm_smp_mc() to make sure the
* cache flush is enforced.
*/
* safe and don't assume anything : we use cmm_smp_mc() to make sure the
* cache flush is enforced.
*/
- list_for_each_entry(index, ®istry, node) {
- C
AA
_STORE_SHARED(index->need_mb, 1);
+
cds_
list_for_each_entry(index, ®istry, node) {
+ C
MM
_STORE_SHARED(index->need_mb, 1);
pthread_kill(index->tid, SIGRCU);
}
/*
pthread_kill(index->tid, SIGRCU);
}
/*
@@
-171,8
+173,8
@@
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, node) {
- while (C
AA
_LOAD_SHARED(index->need_mb)) {
+
cds_
list_for_each_entry(index, ®istry, node) {
+ while (C
MM
_LOAD_SHARED(index->need_mb)) {
pthread_kill(index->tid, SIGRCU);
poll(NULL, 0, 1);
}
pthread_kill(index->tid, SIGRCU);
poll(NULL, 0, 1);
}
@@
-200,12
+202,12
@@
static void wait_gp(void)
void update_counter_and_wait(void)
{
void update_counter_and_wait(void)
{
- LIST_HEAD(qsreaders);
+
CDS_
LIST_HEAD(qsreaders);
int wait_loops = 0;
struct rcu_reader *index, *tmp;
/* Switch parity: 0 -> 1, 1 -> 0 */
int wait_loops = 0;
struct rcu_reader *index, *tmp;
/* Switch parity: 0 -> 1, 1 -> 0 */
- C
AA
_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
+ C
MM
_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
/*
* Must commit rcu_gp_ctr update to memory before waiting for quiescent
/*
* Must commit rcu_gp_ctr update to memory before waiting for quiescent
@@
-234,13
+236,13
@@
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, node) {
+
cds_
list_for_each_entry_safe(index, tmp, ®istry, node) {
if (!rcu_gp_ongoing(&index->ctr))
if (!rcu_gp_ongoing(&index->ctr))
- list_move(&index->node, &qsreaders);
+
cds_
list_move(&index->node, &qsreaders);
}
#ifndef HAS_INCOHERENT_CACHES
}
#ifndef HAS_INCOHERENT_CACHES
- if (list_empty(®istry)) {
+ if (
cds_
list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
@@
-258,7
+260,7
@@
void update_counter_and_wait(void)
* BUSY-LOOP. Force the reader thread to commit its
* rcu_reader.ctr update to memory if we wait for too long.
*/
* BUSY-LOOP. Force the reader thread to commit its
* rcu_reader.ctr update to memory if we wait for too long.
*/
- if (list_empty(®istry)) {
+ if (
cds_
list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
@@
-281,14
+283,14
@@
void update_counter_and_wait(void)
#endif /* #else #ifndef HAS_INCOHERENT_CACHES */
}
/* put back the reader list in the registry */
#endif /* #else #ifndef HAS_INCOHERENT_CACHES */
}
/* put back the reader list in the registry */
- list_splice(&qsreaders, ®istry);
+
cds_
list_splice(&qsreaders, ®istry);
}
void synchronize_rcu(void)
{
mutex_lock(&rcu_gp_lock);
}
void synchronize_rcu(void)
{
mutex_lock(&rcu_gp_lock);
- if (list_empty(®istry))
+ if (
cds_
list_empty(®istry))
goto out;
/* All threads should read qparity before accessing data structure
goto out;
/* All threads should read qparity before accessing data structure
@@
-353,14
+355,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.node, ®istry);
+
cds_
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.node);
+
cds_
list_del(&rcu_reader.node);
mutex_unlock(&rcu_gp_lock);
}
mutex_unlock(&rcu_gp_lock);
}
@@
-384,7
+386,7
@@
static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
* executed on.
*/
cmm_smp_mb();
* executed on.
*/
cmm_smp_mb();
- _C
AA
_STORE_SHARED(rcu_reader.need_mb, 0);
+ _C
MM
_STORE_SHARED(rcu_reader.need_mb, 0);
cmm_smp_mb();
}
cmm_smp_mb();
}
@@
-426,6
+428,9
@@
void rcu_exit(void)
exit(-1);
}
assert(act.sa_sigaction == sigrcu_handler);
exit(-1);
}
assert(act.sa_sigaction == sigrcu_handler);
- assert(list_empty(®istry));
+ assert(
cds_
list_empty(®istry));
}
}
+
#endif /* #ifdef RCU_SIGNAL */
#endif /* #ifdef RCU_SIGNAL */
+
+#include "urcu-call-rcu-impl.h"
This page took
0.041621 seconds
and
4
git commands to generate.