Enhance test cases

[urcu.git] / urcu.c

diff --git a/urcu.c b/urcu.c
index 53c7f37677f762280b2a6337a6820bdf22c55faf..ac1a4d6c9314499d339fdd2a939479ec96deed5f 100644 (file)
--- a/urcu.c
+++ b/urcu.c
@@ -19,8 +19,12 @@
 
 pthread_mutex_t urcu_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-/* Global grace period counter */
-long 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;
 
 long __thread urcu_active_readers;
 
@@ -29,7 +33,7 @@ long __thread urcu_active_readers;
 
 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)
 {
@@ -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