projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: silence gcc -Wextra warning
[urcu.git]
/
urcu.c
diff --git
a/urcu.c
b/urcu.c
index ba013d990b6f052da8e85f69af7192de72a4b799..8420ee494cef759bc2b87287168bacddc525315c 100644
(file)
--- a/
urcu.c
+++ b/
urcu.c
@@
-40,6
+40,9
@@
#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
@@
-49,9
+52,9
@@
/*
* If a reader is really non-cooperative and refuses to commit its
* rcu_active_readers count to memory (there is no barrier in the reader
/*
* If a reader is really non-cooperative and refuses to commit its
* rcu_active_readers count to memory (there is no barrier in the reader
- * per-se), kick it after
a few
loops waiting for it.
+ * per-se), kick it after
10
loops waiting for it.
*/
*/
-#define KICK_READER_LOOPS
1000
0
+#define KICK_READER_LOOPS
1
0
/*
* Active attempts to check for reader Q.S. before calling futex().
/*
* Active attempts to check for reader Q.S. before calling futex().
@@
-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_GLOBAL(struct rcu_reader, rcu_reader)
;
#ifdef DEBUG_YIELD
unsigned int yield_active;
#ifdef DEBUG_YIELD
unsigned int yield_active;
-
unsigned int __thread rand_yield
;
+
__DEFINE_URCU_TLS_GLOBAL(unsigned int, 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,10
+133,8
@@
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
}
#ifdef RCU_MEMBARRIER
@@
-222,8
+218,11
@@
static void wait_gp(void)
void update_counter_and_wait(void)
{
CDS_LIST_HEAD(qsreaders);
void update_counter_and_wait(void)
{
CDS_LIST_HEAD(qsreaders);
- int wait_loops = 0;
+
unsigned
int wait_loops = 0;
struct rcu_reader *index, *tmp;
struct rcu_reader *index, *tmp;
+#ifdef HAS_INCOHERENT_CACHES
+ unsigned int wait_gp_loops = 0;
+#endif /* HAS_INCOHERENT_CACHES */
/* Switch parity: 0 -> 1, 1 -> 0 */
CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
/* Switch parity: 0 -> 1, 1 -> 0 */
CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
@@
-245,11
+244,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 (;;) {
*/
for (;;) {
- wait_loops++;
- if (wait_loops == RCU_QS_ACTIVE_ATTEMPTS) {
+ if (wait_loops < RCU_QS_ACTIVE_ATTEMPTS)
+ wait_loops++;
+ if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
uatomic_dec(&gp_futex);
/* Write futex before read reader_gp */
smp_mb_master(RCU_MB_GROUP);
uatomic_dec(&gp_futex);
/* Write futex before read reader_gp */
smp_mb_master(RCU_MB_GROUP);
@@
-262,14
+262,14
@@
void update_counter_and_wait(void)
#ifndef HAS_INCOHERENT_CACHES
if (cds_list_empty(®istry)) {
#ifndef HAS_INCOHERENT_CACHES
if (cds_list_empty(®istry)) {
- if (wait_loops
=
= RCU_QS_ACTIVE_ATTEMPTS) {
+ if (wait_loops
>
= RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
uatomic_set(&gp_futex, 0);
}
break;
} else {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
uatomic_set(&gp_futex, 0);
}
break;
} else {
- if (wait_loops
=
= RCU_QS_ACTIVE_ATTEMPTS)
+ if (wait_loops
>
= RCU_QS_ACTIVE_ATTEMPTS)
wait_gp();
else
caa_cpu_relax();
wait_gp();
else
caa_cpu_relax();
@@
-277,25
+277,25
@@
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 (cds_list_empty(®istry)) {
- if (wait_loops
=
= RCU_QS_ACTIVE_ATTEMPTS) {
+ if (wait_loops
>
= RCU_QS_ACTIVE_ATTEMPTS) {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
uatomic_set(&gp_futex, 0);
}
break;
} else {
/* Read reader_gp before write futex */
smp_mb_master(RCU_MB_GROUP);
uatomic_set(&gp_futex, 0);
}
break;
} else {
- switch (wait_loops) {
- case RCU_QS_ACTIVE_ATTEMPTS:
- wait_gp();
- break; /* only escape switch */
- case KICK_READER_LOOPS:
+ if (wait_gp_loops == KICK_READER_LOOPS) {
smp_mb_master(RCU_MB_GROUP);
smp_mb_master(RCU_MB_GROUP);
- wait_loops = 0;
- break; /* only escape switch */
- default:
+ wait_gp_loops = 0;
+ }
+ if (wait_loops >= RCU_QS_ACTIVE_ATTEMPTS) {
+ wait_gp();
+ wait_gp_loops++;
+ } else {
caa_cpu_relax();
}
}
caa_cpu_relax();
}
}
@@
-328,7
+328,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
+368,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);
}
@@
-405,7
+405,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
+430,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
+440,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.027011 seconds
and
4
git commands to generate.