projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rculfhash: Add clear flag
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index a3df976e3cea8fd8269d7cb3158b6e38c18fab01..2339bc63c872c6a4826d7a52e8d064d85130c0df 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
@@
-24,16
+24,20
@@
*/
#define _BSD_SOURCE
*/
#define _BSD_SOURCE
+#define _GNU_SOURCE
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <assert.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <errno.h>
#include <poll.h>
#include <string.h>
#include <errno.h>
#include <poll.h>
-#include "urcu-static.h"
+#include "urcu/map/urcu.h"
+
+#include "urcu/static/urcu.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#include "urcu.h"
@@
-59,7
+63,7
@@
void __attribute__((destructor)) rcu_exit(void);
static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
-int gp_futex;
+int
32_t
gp_futex;
/*
* Global grace period counter.
/*
* Global grace period counter.
@@
-80,7
+84,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,10
+103,10
@@
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 (LOAD_SHARED(rcu_reader.need_mb)) {
- smp_mb();
- _STORE_SHARED(rcu_reader.need_mb, 0);
- smp_mb();
+ if (
CMM_
LOAD_SHARED(rcu_reader.need_mb)) {
+
cmm_
smp_mb();
+ _
CMM_
STORE_SHARED(rcu_reader.need_mb, 0);
+
cmm_
smp_mb();
}
poll(NULL,0,10);
}
}
poll(NULL,0,10);
}
@@
-126,14
+130,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,19
+147,19
@@
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.
*/
* compiler barriers around rcu read lock as real memory barriers.
*/
- if (list_empty(®istry))
+ if (
cds_
list_empty(®istry))
return;
/*
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, node) {
- STORE_SHARED(index->need_mb, 1);
+
cds_
list_for_each_entry(index, ®istry, node) {
+
CMM_
STORE_SHARED(index->need_mb, 1);
pthread_kill(index->tid, SIGRCU);
}
/*
pthread_kill(index->tid, SIGRCU);
}
/*
@@
-171,13
+175,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, node) {
- while (LOAD_SHARED(index->need_mb)) {
+
cds_
list_for_each_entry(index, ®istry, node) {
+ while (
CMM_
LOAD_SHARED(index->need_mb)) {
pthread_kill(index->tid, SIGRCU);
poll(NULL, 0, 1);
}
}
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)
@@
-200,12
+204,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 */
- STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
+
CMM_
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
@@
-213,15
+217,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,13
+238,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);
@@
-251,14
+255,14
@@
void update_counter_and_wait(void)
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS)
wait_gp();
else
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS)
wait_gp();
else
- cpu_relax();
+ c
aa_c
pu_relax();
}
#else /* #ifndef HAS_INCOHERENT_CACHES */
/*
* BUSY-LOOP. Force the reader thread to commit its
* rcu_reader.ctr update to memory if we wait for too long.
*/
}
#else /* #ifndef HAS_INCOHERENT_CACHES */
/*
* 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);
@@
-275,20
+279,20
@@
void update_counter_and_wait(void)
wait_loops = 0;
break; /* only escape switch */
default:
wait_loops = 0;
break; /* only escape switch */
default:
- cpu_relax();
+ c
aa_c
pu_relax();
}
}
#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
@@
-309,14
+313,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
+357,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);
}
@@
-379,13
+383,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();
- _STORE_SHARED(rcu_reader.need_mb, 0);
- smp_mb();
+
cmm_
smp_mb();
+ _
CMM_
STORE_SHARED(rcu_reader.need_mb, 0);
+
cmm_
smp_mb();
}
/*
}
/*
@@
-426,6
+430,10
@@
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"
+#include "urcu-defer-impl.h"
This page took
0.03125 seconds
and
4
git commands to generate.