X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu-static.h;h=ad415ac7e86d5c686dc49ddb3f464ad8a24f8178;hp=504febb7cd51059b8c258540955620f4f14449a9;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hpb=e26fa029fb2db4c2f3746a3bfe46e9a0eeeb41a7

diff --git a/urcu-static.h b/urcu-static.h
index 504febb..ad415ac 100644
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -9,7 +9,7 @@
  * TO BE INCLUDED ONLY IN LGPL-COMPATIBLE CODE. See urcu.h for linking
  * dynamically with the userspace rcu 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
@@ -59,7 +59,7 @@ extern "C" {
 # define MEMBARRIER_EXPEDITED		(1 << 0)
 # define MEMBARRIER_DELAYED		(1 << 1)
 # define MEMBARRIER_QUERY		(1 << 16)
-# define membarrier(...)		syscall(__NR_membarrier, __VA_ARGS__)
+# define membarrier(...)		syscall(SYS_membarrier, __VA_ARGS__)
 #else
 # undef RCU_MEMBARRIER
 # define RCU_MB
@@ -181,23 +181,23 @@ extern int has_sys_membarrier;
 static inline void smp_mb_slave(int group)
 {
 	if (likely(has_sys_membarrier))
-		barrier();
+		cmm_barrier();
 	else
-		smp_mb();
+		cmm_smp_mb();
 }
 #endif
 
 #ifdef RCU_MB
 static inline void smp_mb_slave(int group)
 {
-	smp_mb();
+	cmm_smp_mb();
 }
 #endif
 
 #ifdef RCU_SIGNAL
 static inline void smp_mb_slave(int group)
 {
-	barrier();
+	cmm_barrier();
 }
 #endif
 
@@ -222,7 +222,7 @@ struct rcu_reader {
 	unsigned long ctr;
 	char need_mb;
 	/* Data used for registry */
-	struct list_head head __attribute__((aligned(CACHE_LINE_SIZE)));
+	struct list_head node __attribute__((aligned(CACHE_LINE_SIZE)));
 	pthread_t tid;
 };
 
@@ -259,6 +259,7 @@ static inline void _rcu_read_lock(void)
 {
 	unsigned long tmp;
 
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 	tmp = rcu_reader.ctr;
 	/*
 	 * rcu_gp_ctr is
@@ -294,9 +295,10 @@ static inline void _rcu_read_unlock(void)
 	} else {
 		_STORE_SHARED(rcu_reader.ctr, rcu_reader.ctr - RCU_GP_COUNT);
 	}
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif