X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=2339bc63c872c6a4826d7a52e8d064d85130c0df;hp=5a9c2f0ae761d9a4d7cd97ed7af4bfc42998edb7;hb=3eca1b8cce5630bcbd865a8d30855c996bc021c3;hpb=16aa9ee87cf4364921c36025359be01390338d87

diff --git a/urcu.c b/urcu.c
index 5a9c2f0..2339bc6 100644
--- a/urcu.c
+++ b/urcu.c
@@ -24,16 +24,20 @@
  */
 
 #define _BSD_SOURCE
+#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-static.h"
+#include "urcu/map/urcu.h"
+
+#include "urcu/static/urcu.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu.h"
 
@@ -59,7 +63,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.
@@ -99,9 +103,9 @@ static void mutex_lock(pthread_mutex_t *mutex)
 			perror("Error in pthread mutex lock");
 			exit(-1);
 		}
-		if (CAA_LOAD_SHARED(rcu_reader.need_mb)) {
+		if (CMM_LOAD_SHARED(rcu_reader.need_mb)) {
 			cmm_smp_mb();
-			_CAA_STORE_SHARED(rcu_reader.need_mb, 0);
+			_CMM_STORE_SHARED(rcu_reader.need_mb, 0);
 			cmm_smp_mb();
 		}
 		poll(NULL,0,10);
@@ -155,7 +159,7 @@ static void force_mb_all_readers(void)
 	 * cache flush is enforced.
 	 */
 	cds_list_for_each_entry(index, &registry, node) {
-		CAA_STORE_SHARED(index->need_mb, 1);
+		CMM_STORE_SHARED(index->need_mb, 1);
 		pthread_kill(index->tid, SIGRCU);
 	}
 	/*
@@ -172,7 +176,7 @@ static void force_mb_all_readers(void)
 	 * the Linux Test Project (LTP).
 	 */
 	cds_list_for_each_entry(index, &registry, node) {
-		while (CAA_LOAD_SHARED(index->need_mb)) {
+		while (CMM_LOAD_SHARED(index->need_mb)) {
 			pthread_kill(index->tid, SIGRCU);
 			poll(NULL, 0, 1);
 		}
@@ -205,7 +209,7 @@ void update_counter_and_wait(void)
 	struct rcu_reader *index, *tmp;
 
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
 
 	/*
 	 * Must commit rcu_gp_ctr update to memory before waiting for quiescent
@@ -384,7 +388,7 @@ static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
 	 * executed on.
 	 */
 	cmm_smp_mb();
-	_CAA_STORE_SHARED(rcu_reader.need_mb, 0);
+	_CMM_STORE_SHARED(rcu_reader.need_mb, 0);
 	cmm_smp_mb();
 }
 
@@ -428,4 +432,8 @@ void rcu_exit(void)
 	assert(act.sa_sigaction == sigrcu_handler);
 	assert(cds_list_empty(&registry));
 }
+
 #endif /* #ifdef RCU_SIGNAL */
+
+#include "urcu-call-rcu-impl.h"
+#include "urcu-defer-impl.h"