projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix c99 compatibility: use __asm__ and __volatile__ in public headers
[urcu.git]
/
urcu-qsbr.c
diff --git
a/urcu-qsbr.c
b/urcu-qsbr.c
index 8d8a9cf05ced0fd18ef9943110dc22a2e6e05e87..b20d564c5f6799f3ac42d5e53fe4fc331a322cf7 100644
(file)
--- a/
urcu-qsbr.c
+++ b/
urcu-qsbr.c
@@
-24,6
+24,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <pthread.h>
#include <signal.h>
@@
-34,12
+35,17
@@
#include <errno.h>
#include <poll.h>
#include <errno.h>
#include <poll.h>
+#include "urcu/wfqueue.h"
#include "urcu/map/urcu-qsbr.h"
#include "urcu/map/urcu-qsbr.h"
-
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.h"
#define BUILD_QSBR_LIB
#include "urcu/static/urcu-qsbr.h"
+#include "urcu-pointer.h"
+#include "urcu/tls-compat.h"
+
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
/* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
+#undef _LGPL_SOURCE
#include "urcu-qsbr.h"
#include "urcu-qsbr.h"
+#define _LGPL_SOURCE
void __attribute__((destructor)) rcu_exit(void);
void __attribute__((destructor)) rcu_exit(void);
@@
-61,11
+67,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);
@@
-134,7
+140,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();
@@
-201,21
+207,20
@@
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
/* All threads should read qparity before accessing data structure
- * where new ptr points to.
- */
- /* Write new ptr before changing the qparity */
- cmm_smp_mb();
-
- /*
+ * where new ptr points to. In the "then" case, rcu_thread_offline
+ * includes a memory barrier.
+ *
* Mark the writer thread offline to make sure we don't wait for
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
if (was_online)
* Mark the writer thread offline to make sure we don't wait for
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
if (was_online)
- CMM_STORE_SHARED(rcu_reader.ctr, 0);
+ rcu_thread_offline();
+ else
+ cmm_smp_mb();
mutex_lock(&rcu_gp_lock);
mutex_lock(&rcu_gp_lock);
@@
-232,7
+237,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();
@@
-256,25
+261,26
@@
out:
* freed.
*/
if (was_online)
* freed.
*/
if (was_online)
- _CMM_STORE_SHARED(rcu_reader.ctr,
- CMM_LOAD_SHARED(rcu_gp_ctr));
- cmm_smp_mb();
+ rcu_thread_online();
+ else
+
cmm_smp_mb();
}
#else /* !(CAA_BITS_PER_LONG < 64) */
void synchronize_rcu(void)
{
unsigned long was_online;
}
#else /* !(CAA_BITS_PER_LONG < 64) */
void synchronize_rcu(void)
{
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
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
/*
* Mark the writer thread offline to make sure we don't wait for
* our own quiescent state. This allows using synchronize_rcu()
* in threads registered as readers.
*/
- cmm_smp_mb();
if (was_online)
if (was_online)
- CMM_STORE_SHARED(rcu_reader.ctr, 0);
+ rcu_thread_offline();
+ else
+ cmm_smp_mb();
mutex_lock(&rcu_gp_lock);
if (cds_list_empty(®istry))
mutex_lock(&rcu_gp_lock);
if (cds_list_empty(®istry))
@@
-284,9
+290,9
@@
out:
mutex_unlock(&rcu_gp_lock);
if (was_online)
mutex_unlock(&rcu_gp_lock);
if (was_online)
- _CMM_STORE_SHARED(rcu_reader.ctr,
- CMM_LOAD_SHARED(rcu_gp_ctr));
- cmm_smp_mb();
+ rcu_thread_online();
+ else
+
cmm_smp_mb();
}
#endif /* !(CAA_BITS_PER_LONG < 64) */
}
#endif /* !(CAA_BITS_PER_LONG < 64) */
@@
-321,11
+327,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();
}
@@
-338,14
+344,20
@@
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);
}
void rcu_exit(void)
{
mutex_unlock(&rcu_gp_lock);
}
void rcu_exit(void)
{
- assert(cds_list_empty(®istry));
+ /*
+ * Assertion disabled because call_rcu threads are now rcu
+ * readers, and left running at exit.
+ * assert(cds_list_empty(®istry));
+ */
}
}
+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.028967 seconds
and
4
git commands to generate.