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

diff --git a/urcu.c b/urcu.c
index 9fde623..ac1a4d6 100644
--- a/urcu.c
+++ b/urcu.c
@@ -19,17 +19,21 @@
 
 pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/* Global grace period counter */
-int urcu_gp_ctr;
+/*
+ * 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;
+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
@@ -70,6 +74,12 @@ static void switch_next_urcu_qparity(void)
 	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;
@@ -98,6 +108,7 @@ static void force_mb_all_threads(void)
 	mb();	/* read sig_done before ending the barrier */
 	debug_yield_write();
 }
+#endif
 
 void wait_for_quiescent_state(void)
 {
@@ -147,7 +158,7 @@ void synchronize_rcu(void)
 	debug_yield_write();
 	switch_qparity();
 	debug_yield_write();
-	internal_urcu_lock();
+	internal_urcu_unlock();
 	debug_yield_write();
 }
 
@@ -213,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();
@@ -245,3 +257,4 @@ void __attribute__((destructor)) urcu_exit(void)
 	assert(act.sa_sigaction == sigurcu_handler);
 	free(reader_data);
 }
+#endif