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 9c556aa6bd9d3eeff75ce2c8b857bfb59ca4596b..2339bc63c872c6a4826d7a52e8d064d85130c0df 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-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,9
+103,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 (LOAD_SHARED(rcu_reader.need_mb)) {
+ if (
CMM_
LOAD_SHARED(rcu_reader.need_mb)) {
cmm_smp_mb();
cmm_smp_mb();
- _STORE_SHARED(rcu_reader.need_mb, 0);
+ _
CMM_
STORE_SHARED(rcu_reader.need_mb, 0);
cmm_smp_mb();
}
poll(NULL,0,10);
cmm_smp_mb();
}
poll(NULL,0,10);
@@
-146,7
+150,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
+158,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) {
- 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,8
+175,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 (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);
}
@@
-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
@@
-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
@@
-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);
}
@@
-384,7
+388,7
@@
static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
* executed on.
*/
cmm_smp_mb();
* executed on.
*/
cmm_smp_mb();
- _STORE_SHARED(rcu_reader.need_mb, 0);
+ _
CMM_
STORE_SHARED(rcu_reader.need_mb, 0);
cmm_smp_mb();
}
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.027423 seconds
and
4
git commands to generate.