projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: urcu-bp segfault in glibc pthread_kill()
[urcu.git]
/
urcu-qsbr.c
diff --git
a/urcu-qsbr.c
b/urcu-qsbr.c
index 745676e209d3ff44dc828507e43ca8c09f023e9c..d3a6849ac04901097783fd0810b7a4aba4bf792c 100644
(file)
--- a/
urcu-qsbr.c
+++ b/
urcu-qsbr.c
@@
-40,6
+40,9
@@
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.h"
#include "urcu-pointer.h"
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.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
@@
-66,11
+69,11
@@
unsigned long rcu_gp_ctr = RCU_GP_ONLINE;
* 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
unsigned int yield_active;
#ifdef DEBUG_YIELD
unsigned int yield_active;
-
unsigned int __thread rand_yield
;
+
DEFINE_URCU_TLS(unsigned int, rand_yield)
;
#endif
static CDS_LIST_HEAD(registry);
#endif
static CDS_LIST_HEAD(registry);
@@
-81,17
+84,12
@@
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 (ret != EBUSY && ret != EINTR)
+ urcu_die(ret);
poll(NULL,0,10);
}
#endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
poll(NULL,0,10);
}
#endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
@@
-102,10
+100,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);
}
/*
}
/*
@@
-139,7
+135,7
@@
static void update_counter_and_wait(void)
* quiescent state. Failure to do so could result in the writer
* waiting forever while new readers are always accessing data
* (no progress). Enforce compiler-order of store to rcu_gp_ctr
* quiescent state. Failure to do so could result in the writer
* waiting forever while new readers are always accessing data
* (no progress). Enforce compiler-order of store to rcu_gp_ctr
- * before load
rcu_reader
ctr.
+ * before load
URCU_TLS(rcu_reader).
ctr.
*/
cmm_barrier();
*/
cmm_barrier();
@@
-206,7
+202,7
@@
void synchronize_rcu(void)
{
unsigned long was_online;
{
unsigned long was_online;
- was_online =
rcu_reader
.ctr;
+ was_online =
URCU_TLS(rcu_reader)
.ctr;
/* All threads should read qparity before accessing data structure
* where new ptr points to. In the "then" case, rcu_thread_offline
/* All threads should read qparity before accessing data structure
* where new ptr points to. In the "then" case, rcu_thread_offline
@@
-236,7
+232,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
* 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
+ * compiler-order of load
URCU_TLS(rcu_reader).
ctr before store to
* rcu_gp_ctr.
*/
cmm_barrier();
* rcu_gp_ctr.
*/
cmm_barrier();
@@
-269,7
+265,7
@@
void synchronize_rcu(void)
{
unsigned long was_online;
{
unsigned long was_online;
- was_online =
rcu_reader
.ctr;
+ was_online =
URCU_TLS(rcu_reader)
.ctr;
/*
* Mark the writer thread offline to make sure we don't wait for
/*
* Mark the writer thread offline to make sure we don't wait for
@@
-326,11
+322,11
@@
void rcu_thread_online(void)
void rcu_register_thread(void)
{
void rcu_register_thread(void)
{
-
rcu_reader
.tid = pthread_self();
- assert(
rcu_reader
.ctr == 0);
+
URCU_TLS(rcu_reader)
.tid = pthread_self();
+ assert(
URCU_TLS(rcu_reader)
.ctr == 0);
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_gp_lock);
- cds_list_add(&
rcu_reader
.node, ®istry);
+ cds_list_add(&
URCU_TLS(rcu_reader)
.node, ®istry);
mutex_unlock(&rcu_gp_lock);
_rcu_thread_online();
}
mutex_unlock(&rcu_gp_lock);
_rcu_thread_online();
}
@@
-343,7
+339,7
@@
void rcu_unregister_thread(void)
*/
_rcu_thread_offline();
mutex_lock(&rcu_gp_lock);
*/
_rcu_thread_offline();
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);
}
This page took
0.025015 seconds
and
4
git commands to generate.