X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-static.h;h=f2a463c47ab9dd03eff61c84d90c6c0d5edf6f3b;hp=0f3eba113d0efe8471b34d6d094496311c69ac12;hb=cfe78e252a63a8718e0d2f819d196cee5ca3f6c1;hpb=7ac06cef7a7d9394332837edc5c0e9595286a5fc

diff --git a/urcu-static.h b/urcu-static.h
index 0f3eba1..f2a463c 100644
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -31,9 +31,12 @@
 
 #include <stdlib.h>
 #include <pthread.h>
+#include <syscall.h>
+#include <unistd.h>
 
-#include <compiler.h>
-#include <arch.h>
+#include <urcu/compiler.h>
+#include <urcu/arch.h>
+#include <urcu/list.h>
 
 /*
  * Identify a shared load. A smp_rmc() or smp_mc() should come before the load.
@@ -94,6 +97,10 @@
 				(_________p1);				\
 				})
 
+#define futex(...)		syscall(__NR_futex, __VA_ARGS__)
+#define FUTEX_WAIT		0
+#define FUTEX_WAKE		1
+
 /*
  * This code section can only be included in LGPL 2.1 compatible source code.
  * See below for the function call wrappers which can be used in code meant to
@@ -117,6 +124,11 @@
  */
 #define KICK_READER_LOOPS 10000
 
+/*
+ * Active attempts to check for reader Q.S. before calling futex().
+ */
+#define RCU_QS_ACTIVE_ATTEMPTS 100
+
 #ifdef DEBUG_RCU
 #define rcu_assert(args...)	assert(args)
 #else
@@ -133,10 +145,10 @@
 #define YIELD_WRITE	(1 << 1)
 
 /*
- * Updates without CONFIG_URCU_AVOID_SIGNALS are much slower. Account this in
+ * Updates without URCU_MB are much slower. Account this in
  * the delay.
  */
-#ifdef CONFIG_URCU_AVOID_SIGNALS
+#ifdef URCU_MB
 /* maximum sleep delay, in us */
 #define MAX_SLEEP 50
 #else
@@ -179,7 +191,7 @@ static inline void debug_yield_init(void)
 }
 #endif
 
-#ifdef CONFIG_URCU_AVOID_SIGNALS
+#ifdef URCU_MB
 static inline void reader_barrier()
 {
 	smp_mb();
@@ -207,7 +219,28 @@ static inline void reader_barrier()
  */
 extern long urcu_gp_ctr;
 
-extern long __thread urcu_active_readers;
+struct urcu_reader {
+	long ctr;
+	struct list_head head;
+	pthread_t tid;
+	char need_mb;
+};
+
+extern struct urcu_reader __thread urcu_reader;
+
+extern int gp_futex;
+
+/*
+ * Wake-up waiting synchronize_rcu(). Called from many concurrent threads.
+ */
+static inline void wake_up_gp(void)
+{
+	if (unlikely(uatomic_read(&gp_futex) == -1)) {
+		uatomic_set(&gp_futex, 0);
+		futex(&gp_futex, FUTEX_WAKE, 1,
+		      NULL, NULL, 0);
+	}
+}
 
 static inline int rcu_old_gp_ongoing(long *value)
 {
@@ -228,31 +261,38 @@ static inline void _rcu_read_lock(void)
 {
 	long tmp;
 
-	tmp = urcu_active_readers;
+	tmp = urcu_reader.ctr;
 	/* urcu_gp_ctr = RCU_GP_COUNT | (~RCU_GP_CTR_BIT or RCU_GP_CTR_BIT) */
 	if (likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
-		_STORE_SHARED(urcu_active_readers, _LOAD_SHARED(urcu_gp_ctr));
+		_STORE_SHARED(urcu_reader.ctr, _LOAD_SHARED(urcu_gp_ctr));
 		/*
 		 * Set active readers count for outermost nesting level before
 		 * accessing the pointer. See force_mb_all_threads().
 		 */
 		reader_barrier();
 	} else {
-		_STORE_SHARED(urcu_active_readers, tmp + RCU_GP_COUNT);
+		_STORE_SHARED(urcu_reader.ctr, tmp + RCU_GP_COUNT);
 	}
 }
 
 static inline void _rcu_read_unlock(void)
 {
-	reader_barrier();
+	long tmp;
+
+	tmp = urcu_reader.ctr;
 	/*
 	 * Finish using rcu before decrementing the pointer.
 	 * See force_mb_all_threads().
-	 * Formally only needed for outermost nesting level, but leave barrier
-	 * in place for nested unlocks to remove a branch from the common case
-	 * (no nesting).
 	 */
-	_STORE_SHARED(urcu_active_readers, urcu_active_readers - RCU_GP_COUNT);
+	if (likely((tmp & RCU_GP_CTR_NEST_MASK) == RCU_GP_COUNT)) {
+		reader_barrier();
+		_STORE_SHARED(urcu_reader.ctr, urcu_reader.ctr - RCU_GP_COUNT);
+		/* write urcu_reader.ctr before read futex */
+		reader_barrier();
+		wake_up_gp();
+	} else {
+		_STORE_SHARED(urcu_reader.ctr, urcu_reader.ctr - RCU_GP_COUNT);
+	}
 }
 
 /**
@@ -276,6 +316,22 @@ static inline void _rcu_read_unlock(void)
 		STORE_SHARED(p, v);			\
 	})
 
+/**
+ * _rcu_cmpxchg_pointer - same as rcu_assign_pointer, but tests if the pointer
+ * is as expected by "old". If succeeds, returns the previous pointer to the
+ * data structure, which can be safely freed after waiting for a quiescent state
+ * using synchronize_rcu(). If fails (unexpected value), returns old (which
+ * should not be freed !).
+ */
+
+#define _rcu_cmpxchg_pointer(p, old, _new)		\
+	({						\
+		if (!__builtin_constant_p(_new) ||	\
+		    ((_new) != NULL))			\
+			wmb();				\
+		uatomic_cmpxchg(p, old, _new);		\
+	})
+
 /**
  * _rcu_xchg_pointer - same as rcu_assign_pointer, but returns the previous
  * pointer to the data structure, which can be safely freed after waiting for a
@@ -287,7 +343,7 @@ static inline void _rcu_read_unlock(void)
 		if (!__builtin_constant_p(v) ||		\
 		    ((v) != NULL))			\
 			wmb();				\
-		xchg(p, v);				\
+		uatomic_xchg(p, v);			\
 	})
 
 /*