Fix tests: use of uninitialized variables

[userspace-rcu.git] / tests / test_urcu_lfs.c

diff --git a/tests/test_urcu_lfs.c b/tests/test_urcu_lfs.c
index e02fa58b49f4e24acb910628ca31e1025352771b..5c350eb470adf8c7e2348dc05c2fe765628ca4c8 100644 (file)
--- a/tests/test_urcu_lfs.c
+++ b/tests/test_urcu_lfs.c
@@ -34,10 +34,11 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
+#include <urcu/tls-compat.h>
+#include "cpuset.h"
 
 #ifdef __linux__
 #include <syscall.h>
@@ -97,12 +98,6 @@ static int use_affinity = 0;
 
 pthread_mutex_t affinity_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-#ifndef HAVE_CPU_SET_T
-typedef unsigned long cpu_set_t;
-# define CPU_ZERO(cpuset) do { *(cpuset) = 0; } while(0)
-# define CPU_SET(cpu, cpuset) do { *(cpuset) |= (1UL << (cpu)); } while(0)
-#endif
-
 static void set_affinity(void)
 {
        cpu_set_t mask;
@@ -148,11 +143,11 @@ static int test_duration_enqueue(void)
        return !test_stop;
 }
 
-static unsigned long long __thread nr_dequeues;
-static unsigned long long __thread nr_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_enqueues);
 
-static unsigned long long __thread nr_successful_dequeues;
-static unsigned long long __thread nr_successful_enqueues;
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_dequeues);
+static DEFINE_URCU_TLS(unsigned long long, nr_successful_enqueues);
 
 static unsigned int nr_enqueuers;
 static unsigned int nr_dequeuers;
@@ -169,7 +164,8 @@ void *thr_enqueuer(void *_count)
        unsigned long long *count = _count;
 
        printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "enqueuer", pthread_self(), (unsigned long)gettid());
+                       "enqueuer", (unsigned long) pthread_self(),
+                       (unsigned long) gettid());
 
        set_affinity();
 
@@ -187,24 +183,25 @@ void *thr_enqueuer(void *_count)
                cds_lfs_node_init_rcu(&node->list);
                /* No rcu read-side is needed for push */
                cds_lfs_push_rcu(&s, &node->list);
-               nr_successful_enqueues++;
+               URCU_TLS(nr_successful_enqueues)++;
 
-               if (unlikely(wdelay))
+               if (caa_unlikely(wdelay))
                        loop_sleep(wdelay);
 fail:
-               nr_enqueues++;
-               if (unlikely(!test_duration_enqueue()))
+               URCU_TLS(nr_enqueues)++;
+               if (caa_unlikely(!test_duration_enqueue()))
                        break;
        }
 
        rcu_unregister_thread();
 
-       count[0] = nr_enqueues;
-       count[1] = nr_successful_enqueues;
+       count[0] = URCU_TLS(nr_enqueues);
+       count[1] = URCU_TLS(nr_successful_enqueues);
        printf_verbose("enqueuer thread_end, thread id : %lx, tid %lu, "
                       "enqueues %llu successful_enqueues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_enqueues,
-                      nr_successful_enqueues);
+                      (unsigned long) pthread_self(),
+                       (unsigned long) gettid(),
+                      URCU_TLS(nr_enqueues), URCU_TLS(nr_successful_enqueues));
        return ((void*)1);
 
 }
@@ -223,7 +220,8 @@ void *thr_dequeuer(void *_count)
        int ret;
 
        printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "dequeuer", pthread_self(), (unsigned long)gettid());
+                       "dequeuer", (unsigned long) pthread_self(),
+                       (unsigned long) gettid());
 
        set_affinity();
 
@@ -249,12 +247,12 @@ void *thr_dequeuer(void *_count)
                rcu_read_unlock();
                if (node) {
                        call_rcu(&node->rcu, free_node_cb);
-                       nr_successful_dequeues++;
+                       URCU_TLS(nr_successful_dequeues)++;
                }
-               nr_dequeues++;
-               if (unlikely(!test_duration_dequeue()))
+               URCU_TLS(nr_dequeues)++;
+               if (caa_unlikely(!test_duration_dequeue()))
                        break;
-               if (unlikely(rduration))
+               if (caa_unlikely(rduration))
                        loop_sleep(rduration);
        }
 
@@ -263,10 +261,11 @@ void *thr_dequeuer(void *_count)
 
        printf_verbose("dequeuer thread_end, thread id : %lx, tid %lu, "
                       "dequeues %llu, successful_dequeues %llu\n",
-                      pthread_self(), (unsigned long)gettid(), nr_dequeues,
-                      nr_successful_dequeues);
-       count[0] = nr_dequeues;
-       count[1] = nr_successful_dequeues;
+                      (unsigned long) pthread_self(),
+                       (unsigned long) gettid(),
+                      URCU_TLS(nr_dequeues), URCU_TLS(nr_successful_dequeues));
+       count[0] = URCU_TLS(nr_dequeues);
+       count[1] = URCU_TLS(nr_successful_dequeues);
        return ((void*)2);
 }
 
@@ -371,15 +370,19 @@ int main(int argc, char **argv)
        printf_verbose("Writer delay : %lu loops.\n", rduration);
        printf_verbose("Reader duration : %lu loops.\n", wdelay);
        printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-                       "main", pthread_self(), (unsigned long)gettid());
+                       "main", (unsigned long) pthread_self(),
+                       (unsigned long) gettid());
 
-       tid_enqueuer = malloc(sizeof(*tid_enqueuer) * nr_enqueuers);
-       tid_dequeuer = malloc(sizeof(*tid_dequeuer) * nr_dequeuers);
-       count_enqueuer = malloc(2 * sizeof(*count_enqueuer) * nr_enqueuers);
-       count_dequeuer = malloc(2 * sizeof(*count_dequeuer) * nr_dequeuers);
+       tid_enqueuer = calloc(nr_enqueuers, sizeof(*tid_enqueuer));
+       tid_dequeuer = calloc(nr_dequeuers, sizeof(*tid_dequeuer));
+       count_enqueuer = calloc(nr_enqueuers, 2 * sizeof(*count_enqueuer));
+       count_dequeuer = calloc(nr_dequeuers, 2 * sizeof(*count_dequeuer));
        cds_lfs_init_rcu(&s);
+
        err = create_all_cpu_call_rcu_data(0);
-       assert(!err);
+       if (err) {
+               printf("Per-CPU call_rcu() worker threads unavailable. Using default global worker thread.\n");
+       }
 
        next_aff = 0;
 
@@ -446,6 +449,7 @@ int main(int argc, char **argv)
                       tot_successful_enqueues,
                       tot_successful_dequeues + end_dequeues);
 
+       free_all_cpu_call_rcu_data();
        free(count_enqueuer);
        free(count_dequeuer);
        free(tid_enqueuer);