Merge remote branch 'origin/urcu/ht' into urcu/ht

[urcu.git] / tests / test_qsbr.c

diff --git a/tests/test_qsbr.c b/tests/test_qsbr.c
index f3550a0be5902911549892fbf87974eb7c139480..1c5a696c03491db909c4c2a23f42df9a0fe4b4b0 100644 (file)
--- a/tests/test_qsbr.c
+++ b/tests/test_qsbr.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - test program
  *
- * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright February 2009 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,12 +31,15 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
-#include <sys/syscall.h>
 #include <sched.h>
 #include <errno.h>
 
 #include <urcu/arch.h>
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
 /* hardcoded number of CPUs */
 #define NR_CPUS 16384
 
@@ -83,7 +86,7 @@ static unsigned long wduration;
 static inline void loop_sleep(unsigned long l)
 {
        while(l-- != 0)
-               cpu_relax();
+               caa_cpu_relax();
 }
 
 static int verbose_mode;
@@ -182,7 +185,8 @@ void rcu_copy_mutex_unlock(void)
 /*
  * malloc/free are reusing memory areas too quickly, which does not let us
  * test races appropriately. Use a large circular array for allocations.
- * ARRAY_SIZE is larger than nr_writers, which insures we never run over our tail.
+ * ARRAY_SIZE is larger than nr_writers, and we keep the mutex across
+ * both alloc and free, which insures we never run over our tail.
  */
 #define ARRAY_SIZE (1048576 * nr_writers)
 #define ARRAY_POISON 0xDEADBEEF
@@ -194,7 +198,6 @@ static struct test_array *test_array_alloc(void)
        struct test_array *ret;
        int index;
 
-       rcu_copy_mutex_lock();
        index = array_index % ARRAY_SIZE;
        assert(test_array[index].a == ARRAY_POISON ||
                test_array[index].a == 0);
@@ -202,7 +205,6 @@ static struct test_array *test_array_alloc(void)
        array_index++;
        if (array_index == ARRAY_SIZE)
                array_index = 0;
-       rcu_copy_mutex_unlock();
        return ret;
 }
 
@@ -210,9 +212,7 @@ static void test_array_free(struct test_array *ptr)
 {
        if (!ptr)
                return;
-       rcu_copy_mutex_lock();
        ptr->a = ARRAY_POISON;
-       rcu_copy_mutex_unlock();
 }
 
 void *thr_reader(void *_count)
@@ -230,7 +230,7 @@ void *thr_reader(void *_count)
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
                rcu_read_lock();
@@ -251,6 +251,10 @@ void *thr_reader(void *_count)
 
        rcu_unregister_thread();
 
+       /* test extra thread registration */
+       rcu_register_thread();
+       rcu_unregister_thread();
+
        *count = nr_reads;
        printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
                        "reader", pthread_self(), (unsigned long)gettid());
@@ -271,9 +275,10 @@ void *thr_writer(void *_count)
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
+               rcu_copy_mutex_lock();
                new = test_array_alloc();
                new->a = 8;
                old = rcu_xchg_pointer(&test_rcu_pointer, new);
@@ -284,6 +289,7 @@ void *thr_writer(void *_count)
                if (old)
                        old->a = 0;
                test_array_free(old);
+               rcu_copy_mutex_unlock();
                nr_writes++;
                if (unlikely(!test_duration_write()))
                        break;
@@ -399,7 +405,7 @@ int main(int argc, char **argv)
        printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
                        "main", pthread_self(), (unsigned long)gettid());
 
-       test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
+       test_array = calloc(1, sizeof(*test_array) * ARRAY_SIZE);
        tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
        tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
        count_reader = malloc(sizeof(*count_reader) * nr_readers);
@@ -420,7 +426,7 @@ int main(int argc, char **argv)
                        exit(1);
        }
 
-       smp_mb();
+       cmm_smp_mb();
 
        test_go = 1;