Use urcu/tls-compat.h

[urcu.git] / tests / test_urcu_bp.c

diff --git a/tests/test_urcu_bp.c b/tests/test_urcu_bp.c
index 857913f83413e89722ce17f9b00182dc1254bea1..41caeb0995d1d19cfc6bab50d2179c5e2399d576 100644 (file)
--- a/tests/test_urcu_bp.c
+++ b/tests/test_urcu_bp.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/tls-compat.h>
 
 #ifdef __linux__
 #include <syscall.h>
@@ -154,8 +155,8 @@ static int test_duration_read(void)
        return !test_stop;
 }
 
-static unsigned long long __thread nr_writes;
-static unsigned long long __thread nr_reads;
+static DEFINE_URCU_TLS(unsigned long long, nr_writes);
+static DEFINE_URCU_TLS(unsigned long long, nr_reads);
 
 static unsigned int nr_readers;
 static unsigned int nr_writers;
@@ -242,14 +243,14 @@ void *thr_reader(void *_count)
                if (caa_unlikely(rduration))
                        loop_sleep(rduration);
                rcu_read_unlock();
-               nr_reads++;
+               URCU_TLS(nr_reads)++;
                if (caa_unlikely(!test_duration_read()))
                        break;
        }
 
        rcu_unregister_thread();
 
-       *count = nr_reads;
+       *count = URCU_TLS(nr_reads);
        printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
                        "reader", pthread_self(), (unsigned long)gettid());
        return ((void*)1);
@@ -283,7 +284,7 @@ void *thr_writer(void *_count)
                        old->a = 0;
                test_array_free(old);
                rcu_copy_mutex_unlock();
-               nr_writes++;
+               URCU_TLS(nr_writes)++;
                if (caa_unlikely(!test_duration_write()))
                        break;
                if (caa_unlikely(wdelay))
@@ -292,7 +293,7 @@ void *thr_writer(void *_count)
 
        printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
                        "writer", pthread_self(), (unsigned long)gettid());
-       *count = nr_writes;
+       *count = URCU_TLS(nr_writes);
        return ((void*)2);
 }