Cleanup: fix cppcheck errors

[urcu.git] / tests / test_rwlock.c

diff --git a/tests/test_rwlock.c b/tests/test_rwlock.c
index 9c8f97e39cf2232be5f461a655102ba1c3feac07..45dad7869427fc434a021f5bddc60f3f7590ea06 100644 (file)
--- a/tests/test_rwlock.c
+++ b/tests/test_rwlock.c
@@ -35,6 +35,7 @@
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/tls-compat.h>
 
 #ifdef __linux__
 #include <syscall.h>
@@ -85,9 +86,9 @@ static unsigned long rduration;
 /* write-side C.S. duration, in loops */
 static unsigned long wduration;
 
-static inline void loop_sleep(unsigned long l)
+static inline void loop_sleep(unsigned long loops)
 {
-       while(l-- != 0)
+       while (loops-- != 0)
                caa_cpu_relax();
 }
 
@@ -113,9 +114,10 @@ typedef unsigned long cpu_set_t;
 
 static void set_affinity(void)
 {
+#if HAVE_SCHED_SETAFFINITY
        cpu_set_t mask;
-       int cpu;
-       int ret;
+       int cpu, ret;
+#endif /* HAVE_SCHED_SETAFFINITY */
 
        if (!use_affinity)
                return;
@@ -156,8 +158,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;
@@ -201,15 +203,15 @@ void *thr_reader(void *_count)
        for (;;) {
                pthread_rwlock_rdlock(&lock);
                assert(test_array.a == 8);
-               if (unlikely(rduration))
+               if (caa_unlikely(rduration))
                        loop_sleep(rduration);
                pthread_rwlock_unlock(&lock);
-               nr_reads++;
-               if (unlikely(!test_duration_read()))
+               URCU_TLS(nr_reads)++;
+               if (caa_unlikely(!test_duration_read()))
                        break;
        }
 
-       *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);
@@ -234,19 +236,19 @@ void *thr_writer(void *_count)
                pthread_rwlock_wrlock(&lock);
                test_array.a = 0;
                test_array.a = 8;
-               if (unlikely(wduration))
+               if (caa_unlikely(wduration))
                        loop_sleep(wduration);
                pthread_rwlock_unlock(&lock);
-               nr_writes++;
-               if (unlikely(!test_duration_write()))
+               URCU_TLS(nr_writes)++;
+               if (caa_unlikely(!test_duration_write()))
                        break;
-               if (unlikely(wdelay))
+               if (caa_unlikely(wdelay))
                        loop_sleep(wdelay);
        }
 
        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);
 }