urcu tests: hold mutex across use of custom allocator

[urcu.git] / tests / test_qsbr.c

diff --git a/tests/test_qsbr.c b/tests/test_qsbr.c
index 7a68ae836af6a1d7e045da7c476f6d7f6e807cb2..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
 
@@ -77,10 +80,13 @@ static unsigned long duration;
 /* read-side C.S. duration, in loops */
 static unsigned long rduration;
 
+/* write-side C.S. duration, in loops */
+static unsigned long wduration;
+
 static inline void loop_sleep(unsigned long l)
 {
        while(l-- != 0)
-               cpu_relax();
+               caa_cpu_relax();
 }
 
 static int verbose_mode;
@@ -179,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
@@ -191,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);
@@ -199,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;
 }
 
@@ -207,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)
@@ -227,7 +230,7 @@ void *thr_reader(void *_count)
        while (!test_go)
        {
        }
-       smp_mb();
+       cmm_smp_mb();
 
        for (;;) {
                rcu_read_lock();
@@ -248,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());
@@ -268,17 +275,21 @@ 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);
+               if (unlikely(wduration))
+                       loop_sleep(wduration);
                synchronize_rcu();
                /* can be done after unlock */
                if (old)
                        old->a = 0;
                test_array_free(old);
+               rcu_copy_mutex_unlock();
                nr_writes++;
                if (unlikely(!test_duration_write()))
                        break;
@@ -300,6 +311,7 @@ void show_usage(int argc, char **argv)
 #endif
        printf(" [-d delay] (writer period (us))");
        printf(" [-c duration] (reader C.S. duration (in loops))");
+       printf(" [-e duration] (writer C.S. duration (in loops))");
        printf(" [-v] (verbose output)");
        printf(" [-a cpu#] [-a cpu#]... (affinity)");
        printf("\n");
@@ -373,6 +385,13 @@ int main(int argc, char **argv)
                        }
                        wdelay = atol(argv[++i]);
                        break;
+               case 'e':
+                       if (argc < i + 2) {
+                               show_usage(argc, argv);
+                               return -1;
+                       }
+                       wduration = atol(argv[++i]);
+                       break;
                case 'v':
                        verbose_mode = 1;
                        break;
@@ -386,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);
@@ -407,7 +426,7 @@ int main(int argc, char **argv)
                        exit(1);
        }
 
-       smp_mb();
+       cmm_smp_mb();
 
        test_go = 1;
 
@@ -430,10 +449,10 @@ int main(int argc, char **argv)
        
        printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
               tot_writes);
-       printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
+       printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu wdur %6lu "
                "nr_writers %3u "
                "wdelay %6lu nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
-               argv[0], duration, nr_readers, rduration,
+               argv[0], duration, nr_readers, rduration, wduration,
                nr_writers, wdelay, tot_reads, tot_writes,
                tot_reads + tot_writes);
        test_array_free(test_rcu_pointer);