X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu.c;h=ac1a4d6c9314499d339fdd2a939479ec96deed5f;hb=bb48818526ec4317f9e6daeb0aa1cd64d528f754;hp=4362217d49ab4020c0bd199c30410733f32bbd89;hpb=cf380c2fd2f85e3fba4826991fb748255bdc9b76;p=urcu.git

diff --git a/urcu.c b/urcu.c
index 4362217..ac1a4d6 100644
--- a/urcu.c
+++ b/urcu.c
@@ -19,21 +19,26 @@
 
 pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/* Global quiescent period parity */
-int urcu_qparity;
+/*
+ * Global grace period counter.
+ * Contains the current RCU_GP_CTR_BIT.
+ * Also has a RCU_GP_CTR_BIT of 1, to accelerate the reader fast path.
+ */
+long urcu_gp_ctr = RCU_GP_COUNT;
 
-int __thread urcu_active_readers[2];
+long __thread urcu_active_readers;
 
 /* Thread IDs of registered readers */
 #define INIT_NUM_THREADS 4
 
 struct reader_data {
 	pthread_t tid;
-	int *urcu_active_readers;
+	long *urcu_active_readers;
 };
 
 #ifdef DEBUG_YIELD
-int yield_active;
+unsigned int yield_active;
+unsigned int __thread rand_yield;
 #endif
 
 static struct reader_data *reader_data;
@@ -64,13 +69,17 @@ void internal_urcu_unlock(void)
 /*
  * called with urcu_mutex held.
  */
-static int switch_next_urcu_qparity(void)
+static void switch_next_urcu_qparity(void)
 {
-	int old_parity = urcu_qparity;
-	urcu_qparity = 1 - old_parity;
-	return old_parity;
+	urcu_gp_ctr ^= RCU_GP_CTR_BIT;
 }
 
+#ifdef DEBUG_FULL_MB
+static void force_mb_all_threads(void)
+{
+	mb();
+}
+#else
 static void force_mb_all_threads(void)
 {
 	struct reader_data *index;
@@ -99,8 +108,9 @@ static void force_mb_all_threads(void)
 	mb();	/* read sig_done before ending the barrier */
 	debug_yield_write();
 }
+#endif
 
-void wait_for_quiescent_state(int parity)
+void wait_for_quiescent_state(void)
 {
 	struct reader_data *index;
 
@@ -112,7 +122,7 @@ void wait_for_quiescent_state(int parity)
 		/*
 		 * BUSY-LOOP.
 		 */
-		while (index->urcu_active_readers[parity] != 0)
+		while (rcu_old_gp_ongoing(index->urcu_active_readers))
 			barrier();
 	}
 	/*
@@ -126,59 +136,23 @@ void wait_for_quiescent_state(int parity)
 
 static void switch_qparity(void)
 {
-	int prev_parity;
-
 	/* All threads should read qparity before accessing data structure. */
 	/* Write ptr before changing the qparity */
 	force_mb_all_threads();
 	debug_yield_write();
-	prev_parity = switch_next_urcu_qparity();
+	switch_next_urcu_qparity();
 	debug_yield_write();
 
 	/*
 	 * Wait for previous parity to be empty of readers.
 	 */
-	wait_for_quiescent_state(prev_parity);
+	wait_for_quiescent_state();
 }
 
 void synchronize_rcu(void)
 {
 	debug_yield_write();
 	internal_urcu_lock();
-	debug_yield_write();
-	switch_qparity();
-	debug_yield_write();
-	switch_qparity();
-	debug_yield_write();
-	internal_urcu_lock();
-	debug_yield_write();
-}
-
-/*
- * Return old pointer, OK to free, no more reference exist.
- * Called under rcu_write_lock.
- */
-void *urcu_publish_content(void **ptr, void *new)
-{
-	void *oldptr;
-
-	debug_yield_write();
-	internal_urcu_lock();
-	debug_yield_write();
-	/*
-	 * We can publish the new pointer before we change the current qparity.
-	 * Readers seeing the new pointer while being in the previous qparity
-	 * window will make us wait until the end of the quiescent state before
-	 * we release the unrelated memory area. However, given we hold the
-	 * urcu_mutex, we are making sure that no further garbage collection can
-	 * occur until we release the mutex, therefore we guarantee that this
-	 * given reader will have completed its execution using the new pointer
-	 * when the next quiescent state window will be over.
-	 */
-	oldptr = *ptr;
-	debug_yield_write();
-	*ptr = new;
-
 	debug_yield_write();
 	switch_qparity();
 	debug_yield_write();
@@ -186,8 +160,6 @@ void *urcu_publish_content(void **ptr, void *new)
 	debug_yield_write();
 	internal_urcu_unlock();
 	debug_yield_write();
-
-	return oldptr;
 }
 
 void urcu_add_reader(pthread_t id)
@@ -211,7 +183,7 @@ void urcu_add_reader(pthread_t id)
 	}
 	reader_data[num_readers].tid = id;
 	/* reference to the TLS of _this_ reader thread. */
-	reader_data[num_readers].urcu_active_readers = urcu_active_readers;
+	reader_data[num_readers].urcu_active_readers = &urcu_active_readers;
 	num_readers++;
 }
 
@@ -252,6 +224,7 @@ void urcu_unregister_thread(void)
 	internal_urcu_unlock();
 }
 
+#ifndef DEBUG_FULL_MB
 void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)
 {
 	mb();
@@ -284,3 +257,4 @@ void __attribute__((destructor)) urcu_exit(void)
 	assert(act.sa_sigaction == sigurcu_handler);
 	free(reader_data);
 }
+#endif