X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.h;h=673f7952c3f254b79f6f157188b8b812f569fd41;hp=d417f34b52ddd1ce1509835dd0b7f062436d96f2;hb=b257a10b0b05064dcb5dc9d4d1c5f95c0364b9dd;hpb=27b012e271a82b9a0d94543688904f207cd154ea

diff --git a/urcu.h b/urcu.h
index d417f34..673f795 100644
--- a/urcu.h
+++ b/urcu.h
@@ -1,6 +1,16 @@
 #ifndef _URCU_H
 #define _URCU_H
 
+/*
+ * urcu.h
+ *
+ * Userspace RCU header
+ *
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ *
+ * Distributed under GPLv2
+ */
+
 /* The "volatile" is due to gcc bugs */
 #define barrier() __asm__ __volatile__("": : :"memory")
 
@@ -15,12 +25,42 @@
 static inline void atomic_inc(int *v)
 {
 	asm volatile("lock; incl %0"
-		     : "+m" (v->counter));
+		     : "+m" (*v));
 }
 
 /* Nop everywhere except on alpha. */
 #define smp_read_barrier_depends()
 
+/*
+ * Prevent the compiler from merging or refetching accesses.  The compiler
+ * is also forbidden from reordering successive instances of ACCESS_ONCE(),
+ * but only when the compiler is aware of some particular ordering.  One way
+ * to make the compiler aware of ordering is to put the two invocations of
+ * ACCESS_ONCE() in different C statements.
+ *
+ * This macro does absolutely -nothing- to prevent the CPU from reordering,
+ * merging, or refetching absolutely anything at any time.  Its main intended
+ * use is to mediate communication between process-level code and irq/NMI
+ * handlers, all running on the same CPU.
+ */
+#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+
+/**
+ * rcu_dereference - fetch an RCU-protected pointer in an
+ * RCU read-side critical section.  This pointer may later
+ * be safely dereferenced.
+ *
+ * Inserts memory barriers on architectures that require them
+ * (currently only the Alpha), and, more importantly, documents
+ * exactly which pointers are protected by RCU.
+ */
+
+#define rcu_dereference(p)     ({ \
+				typeof(p) _________p1 = ACCESS_ONCE(p); \
+				smp_read_barrier_depends(); \
+				(_________p1); \
+				})
+
 #define SIGURCU SIGUSR1
 
 /* Global quiescent period parity */
@@ -58,6 +98,9 @@ static inline void rcu_read_unlock(int urcu_parity)
 	urcu_active_readers[urcu_parity]--;
 }
 
+extern void rcu_write_lock(void);
+extern void rcu_write_unlock(void);
+
 extern void *urcu_publish_content(void **ptr, void *new);
 
 /*