Add config.h and stamp-h2 to gitignore

[urcu.git] / urcu-static.h

diff --git a/urcu-static.h b/urcu-static.h
index 504febb7cd51059b8c258540955620f4f14449a9..eea39bb0641f8b5d295a46dd4f316761a6e85d21 100644 (file)
--- 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
@@ -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;
 
+       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);
        }
+       barrier();      /* Ensure the compiler does not reorder us with mutex */
 }
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif