X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.c;h=cf8b5cec46d2c10afaff8c53a56e9adfa4e27eb1;hp=607e6aee1f44adbb48d8f569e2be26b414d6c93c;hb=0376e7b2f8d26778ebc4750b34e718c062c92764;hpb=b39e1761c4ccb070fcda1b86dc4ff0c66a853299

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index 607e6ae..cf8b5ce 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -32,6 +32,8 @@
 #include <errno.h>
 #include <poll.h>
 
+#include "urcu-qsbr-map.h"
+
 #define BUILD_QSBR_LIB
 #include "urcu-qsbr-static.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
@@ -114,17 +116,18 @@ static void update_counter_and_wait(void)
 
 #if (CAA_BITS_PER_LONG < 64)
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
 #else	/* !(CAA_BITS_PER_LONG < 64) */
 	/* Increment current G.P. */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR);
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR);
 #endif	/* !(CAA_BITS_PER_LONG < 64) */
 
 	/*
-	 * Must commit rcu_gp_ctr update to memory before waiting for 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.
+	 * Must commit rcu_gp_ctr update to memory before waiting for
+	 * 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.
 	 */
 	cmm_barrier();
 
@@ -194,11 +197,11 @@ void synchronize_rcu(void)
 
 	/*
 	 * 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.
+	 * our own quiescent state. This allows using synchronize_rcu()
+	 * in threads registered as readers.
 	 */
 	if (was_online)
-		CAA_STORE_SHARED(rcu_reader.ctr, 0);
+		CMM_STORE_SHARED(rcu_reader.ctr, 0);
 
 	mutex_lock(&rcu_gp_lock);
 
@@ -212,10 +215,11 @@ void synchronize_rcu(void)
 
 	/*
 	 * Must finish waiting for quiescent state for parity 0 before
-	 * 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.
+	 * 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.
 	 */
 	cmm_barrier();
 
@@ -238,7 +242,8 @@ out:
 	 * freed.
 	 */
 	if (was_online)
-		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
+		_CMM_STORE_SHARED(rcu_reader.ctr,
+				  CMM_LOAD_SHARED(rcu_gp_ctr));
 	cmm_smp_mb();
 }
 #else /* !(CAA_BITS_PER_LONG < 64) */
@@ -250,12 +255,12 @@ void synchronize_rcu(void)
 
 	/*
 	 * 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.
+	 * our own quiescent state. This allows using synchronize_rcu()
+	 * in threads registered as readers.
 	 */
 	cmm_smp_mb();
 	if (was_online)
-		CAA_STORE_SHARED(rcu_reader.ctr, 0);
+		CMM_STORE_SHARED(rcu_reader.ctr, 0);
 
 	mutex_lock(&rcu_gp_lock);
 	if (cds_list_empty(&registry))
@@ -265,7 +270,8 @@ out:
 	mutex_unlock(&rcu_gp_lock);
 
 	if (was_online)
-		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
+		_CMM_STORE_SHARED(rcu_reader.ctr,
+				  CMM_LOAD_SHARED(rcu_gp_ctr));
 	cmm_smp_mb();
 }
 #endif  /* !(CAA_BITS_PER_LONG < 64) */
@@ -326,3 +332,6 @@ void rcu_exit(void)
 {
 	assert(cds_list_empty(&registry));
 }
+
+#include "urcu-call-rcu-impl.h"
+#include "urcu-defer-impl.h"