X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=e0b12be15c2ebdf540446dbbaa16cdce8ff5f4fe;hp=86f0fc507449451d70f276571d3c6aa1be61d98a;hb=acfd099eae9026369f558e73b2a7e35860962d9d;hpb=af147b83c4f67d99e6582f15eea5cb2ae51b8d36

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 86f0fc5..e0b12be 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu-qsbr.h for linking
  * dynamically with the userspace rcu QSBR library.
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (c) 2009 Paul E. McKenney, IBM Corporation.
  *
  * This library is free software; you can redistribute it and/or
@@ -135,7 +135,7 @@ struct rcu_reader {
 	/* Data used by both reader and synchronize_rcu() */
 	unsigned long ctr;
 	/* Data used for registry */
-	struct list_head node __attribute__((aligned(CACHE_LINE_SIZE)));
+	struct cds_list_head node __attribute__((aligned(CAA_CACHE_LINE_SIZE)));
 	pthread_t tid;
 };
 
@@ -159,7 +159,7 @@ static inline int rcu_gp_ongoing(unsigned long *ctr)
 {
 	unsigned long v;
 
-	v = LOAD_SHARED(*ctr);
+	v = CMM_LOAD_SHARED(*ctr);
 	return v && (v != rcu_gp_ctr);
 }
 
@@ -174,25 +174,27 @@ static inline void _rcu_read_unlock(void)
 
 static inline void _rcu_quiescent_state(void)
 {
-	smp_mb();	
-	_STORE_SHARED(rcu_reader.ctr, _LOAD_SHARED(rcu_gp_ctr));
-	smp_mb();	/* write rcu_reader.ctr before read futex */
+	cmm_smp_mb();
+	_CMM_STORE_SHARED(rcu_reader.ctr, _CMM_LOAD_SHARED(rcu_gp_ctr));
+	cmm_smp_mb();	/* write rcu_reader.ctr before read futex */
 	wake_up_gp();
-	smp_mb();
+	cmm_smp_mb();
 }
 
 static inline void _rcu_thread_offline(void)
 {
-	smp_mb();
-	STORE_SHARED(rcu_reader.ctr, 0);
-	smp_mb();	/* write rcu_reader.ctr before read futex */
+	cmm_smp_mb();
+	CMM_STORE_SHARED(rcu_reader.ctr, 0);
+	cmm_smp_mb();	/* write rcu_reader.ctr before read futex */
 	wake_up_gp();
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }
 
 static inline void _rcu_thread_online(void)
 {
-	_STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr));
-	smp_mb();
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
+	_CMM_STORE_SHARED(rcu_reader.ctr, CMM_LOAD_SHARED(rcu_gp_ctr));
+	cmm_smp_mb();
 }
 
 #ifdef __cplusplus