X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.c;h=87cf41d7ee70f274dc6676af06e3c122dd986222;hp=b7c42fdb0c35deb37e8c5d76a4593746206df0d9;hb=848d408839fe4f829db477644c776eba166a0e9a;hpb=16aa9ee87cf4364921c36025359be01390338d87

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index b7c42fd..87cf41d 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -23,17 +23,21 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <signal.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <poll.h>
 
+#include "urcu/map/urcu-qsbr.h"
+
 #define BUILD_QSBR_LIB
-#include "urcu-qsbr-static.h"
+#include "urcu/static/urcu-qsbr.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-qsbr.h"
 
@@ -41,7 +45,7 @@ void __attribute__((destructor)) rcu_exit(void);
 
 static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
 
-int gp_futex;
+int32_t gp_futex;
 
 /*
  * Global grace period counter.
@@ -112,19 +116,20 @@ static void update_counter_and_wait(void)
 	int wait_loops = 0;
 	struct rcu_reader *index, *tmp;
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
-#else	/* !(BITS_PER_LONG < 64) */
+	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);
-#endif	/* !(BITS_PER_LONG < 64) */
+	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();
 
@@ -179,7 +184,7 @@ static void update_counter_and_wait(void)
  * long-size to ensure we do not encounter an overflow bug.
  */
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
 void synchronize_rcu(void)
 {
 	unsigned long was_online;
@@ -194,11 +199,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 +217,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,10 +244,11 @@ 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 /* !(BITS_PER_LONG < 64) */
+#else /* !(CAA_BITS_PER_LONG < 64) */
 void synchronize_rcu(void)
 {
 	unsigned long was_online;
@@ -250,12 +257,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,10 +272,11 @@ 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  /* !(BITS_PER_LONG < 64) */
+#endif  /* !(CAA_BITS_PER_LONG < 64) */
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
@@ -326,3 +334,6 @@ void rcu_exit(void)
 {
 	assert(cds_list_empty(&registry));
 }
+
+#include "urcu-call-rcu-impl.h"
+#include "urcu-defer-impl.h"