projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
urcu-qsbr: improve 2-phase wait scheme
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index ba013d990b6f052da8e85f69af7192de72a4b799..c42184656a3a0381b518aa15372b84a365400dea 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-36,10
+36,13
@@
#include <errno.h>
#include <poll.h>
#include <errno.h>
#include <poll.h>
-#include "urcu/wfqueue.h"
+#include "urcu/wf
c
queue.h"
#include "urcu/map/urcu.h"
#include "urcu/static/urcu.h"
#include "urcu-pointer.h"
#include "urcu/map/urcu.h"
#include "urcu/static/urcu.h"
#include "urcu-pointer.h"
+#include "urcu/tls-compat.h"
+
+#include "urcu-die.h"
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#undef _LGPL_SOURCE
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
#undef _LGPL_SOURCE
@@
-60,7
+63,7
@@
#ifdef RCU_MEMBARRIER
static int init_done;
#ifdef RCU_MEMBARRIER
static int init_done;
-int has_sys_membarrier;
+int
rcu_
has_sys_membarrier;
void __attribute__((constructor)) rcu_init(void);
#endif
void __attribute__((constructor)) rcu_init(void);
#endif
@@
-80,7
+83,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;
-int32_t gp_futex;
+int32_t
rcu_
gp_futex;
/*
* Global grace period counter.
/*
* Global grace period counter.
@@
-94,11
+97,11
@@
unsigned long rcu_gp_ctr = RCU_GP_COUNT;
* Written to only by each individual reader. Read by both the reader and the
* writers.
*/
* Written to only by each individual reader. Read by both the reader and the
* writers.
*/
-
struct rcu_reader __thread rcu_reader
;
+
DEFINE_URCU_TLS(struct rcu_reader, rcu_reader)
;
#ifdef DEBUG_YIELD
#ifdef DEBUG_YIELD
-unsigned int yield_active;
-
unsigned int __thread rand_yield
;
+unsigned int
rcu_
yield_active;
+
DEFINE_URCU_TLS(unsigned int, rcu_rand_yield)
;
#endif
static CDS_LIST_HEAD(registry);
#endif
static CDS_LIST_HEAD(registry);
@@
-109,20
+112,15
@@
static void mutex_lock(pthread_mutex_t *mutex)
#ifndef DISTRUST_SIGNALS_EXTREME
ret = pthread_mutex_lock(mutex);
#ifndef DISTRUST_SIGNALS_EXTREME
ret = pthread_mutex_lock(mutex);
- if (ret) {
- perror("Error in pthread mutex lock");
- exit(-1);
- }
+ if (ret)
+ urcu_die(ret);
#else /* #ifndef DISTRUST_SIGNALS_EXTREME */
while ((ret = pthread_mutex_trylock(mutex)) != 0) {
#else /* #ifndef DISTRUST_SIGNALS_EXTREME */
while ((ret = pthread_mutex_trylock(mutex)) != 0) {
- if (ret != EBUSY && ret != EINTR) {
- printf("ret = %d, errno = %d\n", ret, errno);
- perror("Error in pthread mutex lock");
- exit(-1);
- }
- if (CMM_LOAD_SHARED(rcu_reader.need_mb)) {
+ if (ret != EBUSY && ret != EINTR)
+ urcu_die(ret);
+ if (CMM_LOAD_SHARED(URCU_TLS(rcu_reader).need_mb)) {
cmm_smp_mb();
cmm_smp_mb();
- _CMM_STORE_SHARED(
rcu_reader
.need_mb, 0);
+ _CMM_STORE_SHARED(
URCU_TLS(rcu_reader)
.need_mb, 0);
cmm_smp_mb();
}
poll(NULL,0,10);
cmm_smp_mb();
}
poll(NULL,0,10);
@@
-135,16
+133,14
@@
static void mutex_unlock(pthread_mutex_t *mutex)
int ret;
ret = pthread_mutex_unlock(mutex);
int ret;
ret = pthread_mutex_unlock(mutex);
- if (ret) {
- perror("Error in pthread mutex unlock");
- exit(-1);
- }
+ if (ret)
+ urcu_die(ret);
}
#ifdef RCU_MEMBARRIER
static void smp_mb_master(int group)
{
}
#ifdef RCU_MEMBARRIER
static void smp_mb_master(int group)
{
- if (caa_likely(has_sys_membarrier))
+ if (caa_likely(
rcu_
has_sys_membarrier))
membarrier(MEMBARRIER_EXPEDITED);
else
cmm_smp_mb();
membarrier(MEMBARRIER_EXPEDITED);
else
cmm_smp_mb();
@@
-214,12
+210,12
@@
static void wait_gp(void)
{
/* Read reader_gp before read futex */
smp_mb_master(RCU_MB_GROUP);
{
/* Read reader_gp before read futex */
smp_mb_master(RCU_MB_GROUP);
- if (uatomic_read(&gp_futex) == -1)
- futex_async(&gp_futex, FUTEX_WAIT, -1,
+ if (uatomic_read(&
rcu_
gp_futex) == -1)
+ futex_async(&
rcu_
gp_futex, FUTEX_WAIT, -1,
NULL, NULL, 0);
}
NULL, NULL, 0);
}
-void update_counter_and_wait(void)
+
static
void update_counter_and_wait(void)
{
CDS_LIST_HEAD(qsreaders);
int wait_loops = 0;
{
CDS_LIST_HEAD(qsreaders);
int wait_loops = 0;
@@
-245,12
+241,12
@@
void update_counter_and_wait(void)
cmm_smp_mb();
/*
cmm_smp_mb();
/*
- * Wait for each thread
rcu_reader
.ctr count to become 0.
+ * Wait for each thread
URCU_TLS(rcu_reader)
.ctr count to become 0.
*/
for (;;) {
wait_loops++;
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
*/
for (;;) {
wait_loops++;
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
- uatomic_dec(&gp_futex);
+ uatomic_dec(&
rcu_
gp_futex);
/* Write futex before read reader_gp */
smp_mb_master(RCU_MB_GROUP);
}
/* Write futex before read reader_gp */
smp_mb_master(RCU_MB_GROUP);
}
@@
-265,7
+261,7
@@
void update_counter_and_wait(void)
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);
- uatomic_set(&gp_futex, 0);
+ uatomic_set(&
rcu_
gp_futex, 0);
}
break;
} else {
}
break;
} else {
@@
-277,13
+273,14
@@
void update_counter_and_wait(void)
#else /* #ifndef HAS_INCOHERENT_CACHES */
/*
* BUSY-LOOP. Force the reader thread to commit its
#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.
+ * URCU_TLS(rcu_reader).ctr update to memory if we wait
+ * for too long.
*/
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 (cds_list_empty(®istry)) {
if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
- uatomic_set(&gp_futex, 0);
+ uatomic_set(&
rcu_
gp_futex, 0);
}
break;
} else {
}
break;
} else {
@@
-328,7
+325,7
@@
void synchronize_rcu(void)
* committing next rcu_gp_ctr update to memory. Failure to do so could
* result in the writer waiting forever while new readers are always
* accessing data (no progress). Enforce compiler-order of load
* committing next rcu_gp_ctr update to memory. Failure to do so could
* result in the writer waiting forever while new readers are always
* accessing data (no progress). Enforce compiler-order of load
- *
rcu_reader
ctr before store to rcu_gp_ctr.
+ *
URCU_TLS(rcu_reader).
ctr before store to rcu_gp_ctr.
*/
cmm_barrier();
*/
cmm_barrier();
@@
-368,20
+365,20
@@
void rcu_read_unlock(void)
void rcu_register_thread(void)
{
void rcu_register_thread(void)
{
-
rcu_reader
.tid = pthread_self();
- assert(
rcu_reader
.need_mb == 0);
- assert(!(
rcu_reader
.ctr & RCU_GP_CTR_NEST_MASK));
+
URCU_TLS(rcu_reader)
.tid = pthread_self();
+ assert(
URCU_TLS(rcu_reader)
.need_mb == 0);
+ assert(!(
URCU_TLS(rcu_reader)
.ctr & RCU_GP_CTR_NEST_MASK));
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 */
- cds_list_add(&
rcu_reader
.node, ®istry);
+ cds_list_add(&
URCU_TLS(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);
- cds_list_del(&
rcu_reader
.node);
+ cds_list_del(&
URCU_TLS(rcu_reader)
.node);
mutex_unlock(&rcu_gp_lock);
}
mutex_unlock(&rcu_gp_lock);
}
@@
-392,7
+389,7
@@
void rcu_init(void)
return;
init_done = 1;
if (!membarrier(MEMBARRIER_EXPEDITED | MEMBARRIER_QUERY))
return;
init_done = 1;
if (!membarrier(MEMBARRIER_EXPEDITED | MEMBARRIER_QUERY))
- has_sys_membarrier = 1;
+
rcu_
has_sys_membarrier = 1;
}
#endif
}
#endif
@@
-405,7
+402,7
@@
static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
* executed on.
*/
cmm_smp_mb();
* executed on.
*/
cmm_smp_mb();
- _CMM_STORE_SHARED(
rcu_reader
.need_mb, 0);
+ _CMM_STORE_SHARED(
URCU_TLS(rcu_reader)
.need_mb, 0);
cmm_smp_mb();
}
cmm_smp_mb();
}
@@
-430,10
+427,8
@@
void rcu_init(void)
act.sa_flags = SA_SIGINFO | SA_RESTART;
sigemptyset(&act.sa_mask);
ret = sigaction(SIGRCU, &act, NULL);
act.sa_flags = SA_SIGINFO | SA_RESTART;
sigemptyset(&act.sa_mask);
ret = sigaction(SIGRCU, &act, NULL);
- if (ret) {
- perror("Error in sigaction");
- exit(-1);
- }
+ if (ret)
+ urcu_die(errno);
}
void rcu_exit(void)
}
void rcu_exit(void)
@@
-442,15
+437,15
@@
void rcu_exit(void)
int ret;
ret = sigaction(SIGRCU, NULL, &act);
int ret;
ret = sigaction(SIGRCU, NULL, &act);
- if (ret) {
- perror("Error in sigaction");
- exit(-1);
- }
+ if (ret)
+ urcu_die(errno);
assert(act.sa_sigaction == sigrcu_handler);
assert(cds_list_empty(®istry));
}
#endif /* #ifdef RCU_SIGNAL */
assert(act.sa_sigaction == sigrcu_handler);
assert(cds_list_empty(®istry));
}
#endif /* #ifdef RCU_SIGNAL */
+DEFINE_RCU_FLAVOR(rcu_flavor);
+
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
#include "urcu-call-rcu-impl.h"
#include "urcu-defer-impl.h"
This page took
0.02721 seconds
and
4
git commands to generate.