X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=83d2fe4d6d9c367796d123fb05286f8305dfc332;hp=1a276ce33663439b7cb128e1ab6bea147faec1ed;hb=9d335088c7c7eb6219e32ec9426d336f3a211a77;hpb=2bc59bd7ce26378150512280b67599f9004732a5

diff --git a/urcu.c b/urcu.c
index 1a276ce..83d2fe4 100644
--- a/urcu.c
+++ b/urcu.c
@@ -32,11 +32,16 @@ struct reader_data {
 	int *urcu_active_readers;
 };
 
+#ifdef DEBUG_YIELD
+unsigned int yield_active;
+unsigned int __thread rand_yield;
+#endif
+
 static struct reader_data *reader_data;
 static int num_readers, alloc_readers;
 static int sig_done;
 
-void rcu_write_lock(void)
+void internal_urcu_lock(void)
 {
 	int ret;
 	ret = pthread_mutex_lock(&urcu_mutex);
@@ -46,7 +51,7 @@ void rcu_write_lock(void)
 	}
 }
 
-void rcu_write_unlock(void)
+void internal_urcu_unlock(void)
 {
 	int ret;
 
@@ -76,17 +81,24 @@ static void force_mb_all_threads(void)
 	 */
 	if (!reader_data)
 		return;
+	debug_yield_write();
 	sig_done = 0;
+	debug_yield_write();
 	mb();	/* write sig_done before sending the signals */
-	for (index = reader_data; index < reader_data + num_readers; index++)
+	debug_yield_write();
+	for (index = reader_data; index < reader_data + num_readers; index++) {
 		pthread_kill(index->tid, SIGURCU);
+		debug_yield_write();
+	}
 	/*
 	 * Wait for sighandler (and thus mb()) to execute on every thread.
 	 * BUSY-LOOP.
 	 */
 	while (sig_done < num_readers)
 		barrier();
+	debug_yield_write();
 	mb();	/* read sig_done before ending the barrier */
+	debug_yield_write();
 }
 
 void wait_for_quiescent_state(int parity)
@@ -120,7 +132,9 @@ static void switch_qparity(void)
 	/* 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();
+	debug_yield_write();
 
 	/*
 	 * Wait for previous parity to be empty of readers.
@@ -130,10 +144,15 @@ static void switch_qparity(void)
 
 void synchronize_rcu(void)
 {
-	rcu_write_lock();
+	debug_yield_write();
+	internal_urcu_lock();
+	debug_yield_write();
 	switch_qparity();
+	debug_yield_write();
 	switch_qparity();
-	rcu_write_unlock();
+	debug_yield_write();
+	internal_urcu_lock();
+	debug_yield_write();
 }
 
 /*
@@ -144,6 +163,9 @@ 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
@@ -155,10 +177,16 @@ void *urcu_publish_content(void **ptr, void *new)
 	 * when the next quiescent state window will be over.
 	 */
 	oldptr = *ptr;
+	debug_yield_write();
 	*ptr = new;
 
+	debug_yield_write();
 	switch_qparity();
+	debug_yield_write();
 	switch_qparity();
+	debug_yield_write();
+	internal_urcu_unlock();
+	debug_yield_write();
 
 	return oldptr;
 }
@@ -213,16 +241,16 @@ void urcu_remove_reader(pthread_t id)
 
 void urcu_register_thread(void)
 {
-	rcu_write_lock();
+	internal_urcu_lock();
 	urcu_add_reader(pthread_self());
-	rcu_write_unlock();
+	internal_urcu_unlock();
 }
 
 void urcu_unregister_thread(void)
 {
-	rcu_write_lock();
+	internal_urcu_lock();
 	urcu_remove_reader(pthread_self());
-	rcu_write_unlock();
+	internal_urcu_unlock();
 }
 
 void sigurcu_handler(int signo, siginfo_t *siginfo, void *context)