Enhance test cases

[urcu.git] / urcu.c

diff --git a/urcu.c b/urcu.c
index 23a985b9f9f4cdaf992c227322720e38bc139d85..ac1a4d6c9314499d339fdd2a939479ec96deed5f 100644 (file)
--- 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)
 {
@@ -142,40 +153,6 @@ 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();
-       rcu_assign_pointer(*ptr, new);
-
        debug_yield_write();
        switch_qparity();
        debug_yield_write();
@@ -183,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)
@@ -249,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();
@@ -281,3 +257,4 @@ void __attribute__((destructor)) urcu_exit(void)
        assert(act.sa_sigaction == sigurcu_handler);
        free(reader_data);
 }
+#endif