rename test_qsbr to test_urcu_qsbr
authorLai Jiangshan <laijs@cn.fujitsu.com>
Fri, 14 Oct 2011 13:46:30 +0000 (08:46 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 14 Oct 2011 13:46:30 +0000 (08:46 -0500)
[ edit by Mathieu Desnoyers: update runtests*.sh scripts accordingly ]

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
tests/Makefile.am
tests/runtests-batch.sh
tests/runtests.sh
tests/test_qsbr.c [deleted file]
tests/test_qsbr_gc.c [deleted file]
tests/test_qsbr_timing.c [deleted file]

index 9f5fbb130bf4eea10e9fc6bb77ac0ae3bbe6cf45..44fac55aa938d712d3a91b9c5143d73c2da14d2f 100644 (file)
@@ -5,12 +5,12 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
        test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
         test_rwlock_timing test_rwlock test_perthreadlock_timing \
         test_perthreadlock test_urcu_yield test_urcu_signal_yield test_urcu_mb \
-        test_qsbr_timing test_qsbr rcutorture_urcu rcutorture_urcu_signal \
-        rcutorture_urcu_mb rcutorture_urcu_bp rcutorture_qsbr \
+        test_urcu_qsbr_timing test_urcu_qsbr rcutorture_urcu rcutorture_urcu_signal \
+        rcutorture_urcu_mb rcutorture_urcu_bp rcutorture_urcu_qsbr \
        test_mutex test_looplen test_urcu_gc test_urcu_signal_gc \
        test_urcu_lgc \
-        test_urcu_mb_gc test_qsbr_gc test_qsbr_lgc test_urcu_signal_lgc \
-        test_urcu_mb_lgc test_qsbr_dynamic_link test_urcu_defer \
+        test_urcu_mb_gc test_urcu_qsbr_gc test_urcu_qsbr_lgc test_urcu_signal_lgc \
+        test_urcu_mb_lgc test_urcu_qsbr_dynamic_link test_urcu_defer \
         test_uatomic test_urcu_assign test_urcu_assign_dynamic_link \
         test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \
        test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \
@@ -58,9 +58,9 @@ test_urcu_yield_SOURCES = test_urcu.c $(URCU)
 test_urcu_yield_CFLAGS = -DDEBUG_YIELD $(AM_CFLAGS)
 
 
-test_qsbr_SOURCES = test_qsbr.c $(URCU_QSBR)
+test_urcu_qsbr_SOURCES = test_urcu_qsbr.c $(URCU_QSBR)
 
-test_qsbr_timing_SOURCES = test_qsbr_timing.c $(URCU_QSBR)
+test_urcu_qsbr_timing_SOURCES = test_urcu_qsbr_timing.c $(URCU_QSBR)
 
 
 test_urcu_mb_SOURCES = test_urcu.c $(URCU_MB)
@@ -98,9 +98,9 @@ rcutorture_urcu_mb_SOURCES = urcutorture.c
 rcutorture_urcu_mb_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 rcutorture_urcu_mb_LDADD = $(URCU_MB_LIB)
 
-rcutorture_qsbr_SOURCES = urcutorture.c
-rcutorture_qsbr_CFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CFLAGS)
-rcutorture_qsbr_LDADD = $(URCU_QSBR_LIB)
+rcutorture_urcu_qsbr_SOURCES = urcutorture.c
+rcutorture_urcu_qsbr_CFLAGS = -DTORTURE_QSBR -DRCU_QSBR $(AM_CFLAGS)
+rcutorture_urcu_qsbr_LDADD = $(URCU_QSBR_LIB)
 
 rcutorture_urcu_signal_SOURCES = urcutorture.c
 rcutorture_urcu_signal_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
@@ -122,10 +122,10 @@ test_urcu_signal_gc_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
 test_urcu_mb_gc_SOURCES = test_urcu_gc.c $(URCU_MB)
 test_urcu_mb_gc_CFLAGS = -DRCU_MB $(AM_CFLAGS)
 
-test_qsbr_gc_SOURCES = test_qsbr_gc.c $(URCU_QSBR)
+test_urcu_qsbr_gc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR)
 
-test_qsbr_lgc_SOURCES = test_qsbr_gc.c $(URCU_QSBR)
-test_qsbr_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS)
+test_urcu_qsbr_lgc_SOURCES = test_urcu_qsbr_gc.c $(URCU_QSBR)
+test_urcu_qsbr_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS)
 
 test_urcu_lgc_SOURCES = test_urcu_gc.c $(URCU)
 test_urcu_lgc_CFLAGS = -DTEST_LOCAL_GC $(AM_CFLAGS)
@@ -136,8 +136,8 @@ test_urcu_signal_lgc_CFLAGS = -DRCU_SIGNAL -DTEST_LOCAL_GC $(AM_CFLAGS)
 test_urcu_mb_lgc_SOURCES = test_urcu_gc.c $(URCU_MB)
 test_urcu_mb_lgc_CFLAGS = -DTEST_LOCAL_GC -DRCU_MB $(AM_CFLAGS)
 
-test_qsbr_dynamic_link_SOURCES = test_qsbr.c $(URCU_QSBR)
-test_qsbr_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
+test_urcu_qsbr_dynamic_link_SOURCES = test_urcu_qsbr.c $(URCU_QSBR)
+test_urcu_qsbr_dynamic_link_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS)
 
 test_urcu_defer_SOURCES = test_urcu_defer.c $(URCU_DEFER)
 
index 67e019b1a0fcda9532acd9856f53d59005977524..4340147905907fbf3d07a61960383d9572a674d7 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#for a in test_urcu_gc test_urcu_gc_mb test_qsbr_gc; do
+#for a in test_urcu_gc test_urcu_gc_mb test_urcu_qsbr_gc; do
 for a in test_urcu_gc; do
        echo "./${a} $*" | tee -a runall.detail.log
        /usr/bin/time --append --output runall.detail.log ./${a} $*
index 4b5f745b01a1e294be83a2bf3fa9e04a9df37589..aace60b63eac876d55d0970cd35ad3311d65af1a 100755 (executable)
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-for a in test_urcu_gc test_urcu_signal_gc test_urcu_mb_gc test_qsbr_gc \
-       test_urcu_lgc test_urcu_signal_lgc test_urcu_mb_lgc test_qsbr_lgc \
-       test_urcu test_urcu_signal test_urcu_mb test_qsbr \
+for a in test_urcu_gc test_urcu_signal_gc test_urcu_mb_gc test_urcu_qsbr_gc \
+       test_urcu_lgc test_urcu_signal_lgc test_urcu_mb_lgc test_urcu_qsbr_lgc \
+       test_urcu test_urcu_signal test_urcu_mb test_urcu_qsbr \
        test_rwlock test_perthreadlock test_mutex; do
        echo "./${a} $*" | tee -a runall.detail.log
        /usr/bin/time --append --output runall.detail.log ./${a} $*
diff --git a/tests/test_qsbr.c b/tests/test_qsbr.c
deleted file mode 100644 (file)
index 1c5a696..0000000
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * test_urcu.c
- *
- * Userspace RCU library - test program
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#define _GNU_SOURCE
-#include "../config.h"
-#include <stdio.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <assert.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
-
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-       return getpid();
-}
-#endif
-
-#ifndef DYNAMIC_LINK_TEST
-#define _LGPL_SOURCE
-#else
-#define debug_yield_read()
-#endif
-#include "urcu-qsbr.h"
-
-struct test_array {
-       int a;
-};
-
-static volatile int test_go, test_stop;
-
-static unsigned long wdelay;
-
-static struct test_array *test_rcu_pointer;
-
-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)
-               caa_cpu_relax();
-}
-
-static int verbose_mode;
-
-#define printf_verbose(fmt, args...)           \
-       do {                                    \
-               if (verbose_mode)               \
-                       printf(fmt, args);      \
-       } while (0)
-
-static unsigned int cpu_affinities[NR_CPUS];
-static unsigned int next_aff = 0;
-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;
-       int cpu;
-       int ret;
-
-       if (!use_affinity)
-               return;
-
-#if HAVE_SCHED_SETAFFINITY
-       ret = pthread_mutex_lock(&affinity_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-       cpu = cpu_affinities[next_aff++];
-       ret = pthread_mutex_unlock(&affinity_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-       CPU_ZERO(&mask);
-       CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-       sched_setaffinity(0, &mask);
-#else
-       sched_setaffinity(0, sizeof(mask), &mask);
-#endif
-#endif /* HAVE_SCHED_SETAFFINITY */
-}
-
-/*
- * returns 0 if test should end.
- */
-static int test_duration_write(void)
-{
-       return !test_stop;
-}
-
-static int test_duration_read(void)
-{
-       return !test_stop;
-}
-
-static unsigned long long __thread nr_writes;
-static unsigned long long __thread nr_reads;
-
-static unsigned int nr_readers;
-static unsigned int nr_writers;
-
-pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
-/*
- * 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, 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
-static int array_index;
-static struct test_array *test_array;
-
-static struct test_array *test_array_alloc(void)
-{
-       struct test_array *ret;
-       int index;
-
-       index = array_index % ARRAY_SIZE;
-       assert(test_array[index].a == ARRAY_POISON ||
-               test_array[index].a == 0);
-       ret = &test_array[index];
-       array_index++;
-       if (array_index == ARRAY_SIZE)
-               array_index = 0;
-       return ret;
-}
-
-static void test_array_free(struct test_array *ptr)
-{
-       if (!ptr)
-               return;
-       ptr->a = ARRAY_POISON;
-}
-
-void *thr_reader(void *_count)
-{
-       unsigned long long *count = _count;
-       struct test_array *local_ptr;
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       rcu_register_thread();
-
-       while (!test_go)
-       {
-       }
-       cmm_smp_mb();
-
-       for (;;) {
-               rcu_read_lock();
-               local_ptr = rcu_dereference(test_rcu_pointer);
-               debug_yield_read();
-               if (local_ptr)
-                       assert(local_ptr->a == 8);
-               if (unlikely(rduration))
-                       loop_sleep(rduration);
-               rcu_read_unlock();
-               nr_reads++;
-               /* QS each 1024 reads */
-               if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
-                       rcu_quiescent_state();
-               if (unlikely(!test_duration_read()))
-                       break;
-       }
-
-       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());
-       return ((void*)1);
-
-}
-
-void *thr_writer(void *_count)
-{
-       unsigned long long *count = _count;
-       struct test_array *new, *old;
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       while (!test_go)
-       {
-       }
-       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;
-               if (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;
-       return ((void*)2);
-}
-
-void show_usage(int argc, char **argv)
-{
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
-#ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
-#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");
-}
-
-int main(int argc, char **argv)
-{
-       int err;
-       pthread_t *tid_reader, *tid_writer;
-       void *tret;
-       unsigned long long *count_reader, *count_writer;
-       unsigned long long tot_reads = 0, tot_writes = 0;
-       int i, a;
-
-       if (argc < 4) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       err = sscanf(argv[1], "%u", &nr_readers);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       err = sscanf(argv[2], "%u", &nr_writers);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-       
-       err = sscanf(argv[3], "%lu", &duration);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       for (i = 4; i < argc; i++) {
-               if (argv[i][0] != '-')
-                       continue;
-               switch (argv[i][1]) {
-#ifdef DEBUG_YIELD
-               case 'r':
-                       yield_active |= YIELD_READ;
-                       break;
-               case 'w':
-                       yield_active |= YIELD_WRITE;
-                       break;
-#endif
-               case 'a':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       a = atoi(argv[++i]);
-                       cpu_affinities[next_aff++] = a;
-                       use_affinity = 1;
-                       printf_verbose("Adding CPU %d affinity\n", a);
-                       break;
-               case 'c':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       rduration = atol(argv[++i]);
-                       break;
-               case 'd':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       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;
-               }
-       }
-
-       printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
-               duration, nr_readers, nr_writers);
-       printf_verbose("Writer delay : %lu loops.\n", wdelay);
-       printf_verbose("Reader duration : %lu loops.\n", rduration);
-       printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-                       "main", pthread_self(), (unsigned long)gettid());
-
-       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);
-       count_writer = malloc(sizeof(*count_writer) * nr_writers);
-
-       next_aff = 0;
-
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_create(&tid_reader[i], NULL, thr_reader,
-                                    &count_reader[i]);
-               if (err != 0)
-                       exit(1);
-       }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_create(&tid_writer[i], NULL, thr_writer,
-                                    &count_writer[i]);
-               if (err != 0)
-                       exit(1);
-       }
-
-       cmm_smp_mb();
-
-       test_go = 1;
-
-       sleep(duration);
-
-       test_stop = 1;
-
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_join(tid_reader[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_reads += count_reader[i];
-       }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_join(tid_writer[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_writes += count_writer[i];
-       }
-       
-       printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
-              tot_writes);
-       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, wduration,
-               nr_writers, wdelay, tot_reads, tot_writes,
-               tot_reads + tot_writes);
-       test_array_free(test_rcu_pointer);
-       free(test_array);
-       free(tid_reader);
-       free(tid_writer);
-       free(count_reader);
-       free(count_writer);
-       return 0;
-}
diff --git a/tests/test_qsbr_gc.c b/tests/test_qsbr_gc.c
deleted file mode 100644 (file)
index 0c1c124..0000000
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * test_urcu_gc.c
- *
- * Userspace RCU library - test program (with baatch reclamation)
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#define _GNU_SOURCE
-#include "../config.h"
-#include <stdio.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <assert.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
-
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-       return getpid();
-}
-#endif
-
-#define _LGPL_SOURCE
-#include <urcu-qsbr.h>
-
-struct test_array {
-       int a;
-};
-
-static volatile int test_go, test_stop;
-
-static unsigned long wdelay;
-
-static struct test_array *test_rcu_pointer;
-
-static unsigned long duration;
-
-/* read-side C.S. duration, in loops */
-static unsigned long rduration;
-static unsigned int reclaim_batch = 1;
-
-struct reclaim_queue {
-       void **queue;   /* Beginning of queue */
-       void **head;    /* Insert position */
-};
-
-static struct reclaim_queue *pending_reclaims;
-
-
-/* write-side C.S. duration, in loops */
-static unsigned long wduration;
-
-static inline void loop_sleep(unsigned long l)
-{
-       while(l-- != 0)
-               caa_cpu_relax();
-}
-
-static int verbose_mode;
-
-#define printf_verbose(fmt, args...)           \
-       do {                                    \
-               if (verbose_mode)               \
-                       printf(fmt, args);      \
-       } while (0)
-
-static unsigned int cpu_affinities[NR_CPUS];
-static unsigned int next_aff = 0;
-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;
-       int cpu;
-       int ret;
-
-       if (!use_affinity)
-               return;
-
-#if HAVE_SCHED_SETAFFINITY
-       ret = pthread_mutex_lock(&affinity_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-       cpu = cpu_affinities[next_aff++];
-       ret = pthread_mutex_unlock(&affinity_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-
-       CPU_ZERO(&mask);
-       CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-       sched_setaffinity(0, &mask);
-#else
-       sched_setaffinity(0, sizeof(mask), &mask);
-#endif
-#endif /* HAVE_SCHED_SETAFFINITY */
-}
-
-/*
- * returns 0 if test should end.
- */
-static int test_duration_write(void)
-{
-       return !test_stop;
-}
-
-static int test_duration_read(void)
-{
-       return !test_stop;
-}
-
-static unsigned long long __thread nr_writes;
-static unsigned long long __thread nr_reads;
-
-static unsigned int nr_readers;
-static unsigned int nr_writers;
-
-pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
-static
-unsigned long long __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *tot_nr_writes;
-
-
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
-void *thr_reader(void *_count)
-{
-       unsigned long long *count = _count;
-       struct test_array *local_ptr;
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       rcu_register_thread();
-
-       while (!test_go)
-       {
-       }
-       cmm_smp_mb();
-
-       for (;;) {
-               _rcu_read_lock();
-               local_ptr = _rcu_dereference(test_rcu_pointer);
-               debug_yield_read();
-               if (local_ptr)
-                       assert(local_ptr->a == 8);
-               if (unlikely(rduration))
-                       loop_sleep(rduration);
-               _rcu_read_unlock();
-               nr_reads++;
-               /* QS each 1024 reads */
-               if (unlikely((nr_reads & ((1 << 10) - 1)) == 0))
-                       _rcu_quiescent_state();
-               if (unlikely(!test_duration_read()))
-                       break;
-       }
-
-       rcu_unregister_thread();
-
-       *count = nr_reads;
-       printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-       return ((void*)1);
-
-}
-
-static void rcu_gc_clear_queue(unsigned long wtidx)
-{
-       void **p;
-
-       /* Wait for Q.S and empty queue */
-       synchronize_rcu();
-
-       for (p = pending_reclaims[wtidx].queue;
-                       p < pending_reclaims[wtidx].head; p++) {
-               /* poison */
-               if (*p)
-                       ((struct test_array *)*p)->a = 0;
-               free(*p);
-       }
-       pending_reclaims[wtidx].head = pending_reclaims[wtidx].queue;
-}
-
-/* Using per-thread queue */
-static void rcu_gc_reclaim(unsigned long wtidx, void *old)
-{
-       /* Queue pointer */
-       *pending_reclaims[wtidx].head = old;
-       pending_reclaims[wtidx].head++;
-
-       if (likely(pending_reclaims[wtidx].head - pending_reclaims[wtidx].queue
-                       < reclaim_batch))
-               return;
-
-       rcu_gc_clear_queue(wtidx);
-}
-
-void *thr_writer(void *data)
-{
-       unsigned long wtidx = (unsigned long)data;
-#ifdef TEST_LOCAL_GC
-       struct test_array *old = NULL;
-#else
-       struct test_array *new, *old;
-#endif
-
-       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-
-       set_affinity();
-
-       while (!test_go)
-       {
-       }
-       cmm_smp_mb();
-
-       for (;;) {
-#ifndef TEST_LOCAL_GC
-               new = malloc(sizeof(*new));
-               new->a = 8;
-               old = _rcu_xchg_pointer(&test_rcu_pointer, new);
-#endif
-               if (unlikely(wduration))
-                       loop_sleep(wduration);
-               rcu_gc_reclaim(wtidx, old);
-               nr_writes++;
-               if (unlikely(!test_duration_write()))
-                       break;
-               if (unlikely(wdelay))
-                       loop_sleep(wdelay);
-       }
-
-       printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-       tot_nr_writes[wtidx] = nr_writes;
-       return ((void*)2);
-}
-
-void show_usage(int argc, char **argv)
-{
-       printf("Usage : %s nr_readers nr_writers duration (s)", argv[0]);
-#ifdef DEBUG_YIELD
-       printf(" [-r] [-w] (yield reader and/or writer)");
-#endif
-       printf(" [-b batch] (batch reclaim)");
-       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");
-}
-
-int main(int argc, char **argv)
-{
-       int err;
-       pthread_t *tid_reader, *tid_writer;
-       void *tret;
-       unsigned long long *count_reader;
-       unsigned long long tot_reads = 0, tot_writes = 0;
-       int i, a;
-
-       if (argc < 4) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       err = sscanf(argv[1], "%u", &nr_readers);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       err = sscanf(argv[2], "%u", &nr_writers);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-       
-       err = sscanf(argv[3], "%lu", &duration);
-       if (err != 1) {
-               show_usage(argc, argv);
-               return -1;
-       }
-
-       for (i = 4; i < argc; i++) {
-               if (argv[i][0] != '-')
-                       continue;
-               switch (argv[i][1]) {
-#ifdef DEBUG_YIELD
-               case 'r':
-                       yield_active |= YIELD_READ;
-                       break;
-               case 'w':
-                       yield_active |= YIELD_WRITE;
-                       break;
-#endif
-               case 'a':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       a = atoi(argv[++i]);
-                       cpu_affinities[next_aff++] = a;
-                       use_affinity = 1;
-                       printf_verbose("Adding CPU %d affinity\n", a);
-                       break;
-               case 'b':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       reclaim_batch = atol(argv[++i]);
-                       break;
-               case 'c':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       rduration = atol(argv[++i]);
-                       break;
-               case 'd':
-                       if (argc < i + 2) {
-                               show_usage(argc, argv);
-                               return -1;
-                       }
-                       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;
-               }
-       }
-
-       printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
-               duration, nr_readers, nr_writers);
-       printf_verbose("Writer delay : %lu loops.\n", wdelay);
-       printf_verbose("Reader duration : %lu loops.\n", rduration);
-       printf_verbose("thread %-6s, thread id : %lx, tid %lu\n",
-                       "main", pthread_self(), (unsigned long)gettid());
-
-       tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
-       tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
-       count_reader = malloc(sizeof(*count_reader) * nr_readers);
-       tot_nr_writes = malloc(sizeof(*tot_nr_writes) * nr_writers);
-       pending_reclaims = malloc(sizeof(*pending_reclaims) * nr_writers);
-       if (reclaim_batch * sizeof(*pending_reclaims[i].queue)
-                       < CAA_CACHE_LINE_SIZE)
-               for (i = 0; i < nr_writers; i++)
-                       pending_reclaims[i].queue = calloc(1, CAA_CACHE_LINE_SIZE);
-       else
-               for (i = 0; i < nr_writers; i++)
-                       pending_reclaims[i].queue = calloc(reclaim_batch,
-                                       sizeof(*pending_reclaims[i].queue));
-       for (i = 0; i < nr_writers; i++)
-               pending_reclaims[i].head = pending_reclaims[i].queue;
-
-       next_aff = 0;
-
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_create(&tid_reader[i], NULL, thr_reader,
-                                    &count_reader[i]);
-               if (err != 0)
-                       exit(1);
-       }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_create(&tid_writer[i], NULL, thr_writer,
-                                    (void *)(long)i);
-               if (err != 0)
-                       exit(1);
-       }
-
-       cmm_smp_mb();
-
-       test_go = 1;
-
-       sleep(duration);
-
-       test_stop = 1;
-
-       for (i = 0; i < nr_readers; i++) {
-               err = pthread_join(tid_reader[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_reads += count_reader[i];
-       }
-       for (i = 0; i < nr_writers; i++) {
-               err = pthread_join(tid_writer[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_writes += tot_nr_writes[i];
-               rcu_gc_clear_queue(i);
-       }
-       
-       printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
-              tot_writes);
-       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 "
-               "batch %u\n",
-               argv[0], duration, nr_readers, rduration, wduration,
-               nr_writers, wdelay, tot_reads, tot_writes,
-               tot_reads + tot_writes, reclaim_batch);
-       free(tid_reader);
-       free(tid_writer);
-       free(count_reader);
-       free(tot_nr_writes);
-       for (i = 0; i < nr_writers; i++)
-               free(pending_reclaims[i].queue);
-       free(pending_reclaims);
-
-       return 0;
-}
diff --git a/tests/test_qsbr_timing.c b/tests/test_qsbr_timing.c
deleted file mode 100644 (file)
index 7925548..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * test_qsbr_timing.c
- *
- * Userspace QSBR - test program
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-
-#include <urcu/arch.h>
-
-#ifdef __linux__
-#include <syscall.h>
-#endif
-
-#if defined(_syscall0)
-_syscall0(pid_t, gettid)
-#elif defined(__NR_gettid)
-static inline pid_t gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-#else
-#warning "use pid as tid"
-static inline pid_t gettid(void)
-{
-       return getpid();
-}
-#endif
-
-#define _LGPL_SOURCE
-#include <urcu-qsbr.h>
-
-pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
-struct test_array {
-       int a;
-};
-
-static struct test_array *test_rcu_pointer;
-
-#define OUTER_READ_LOOP        2000U
-#define INNER_READ_LOOP        100000U
-#define READ_LOOP ((unsigned long long)OUTER_READ_LOOP * INNER_READ_LOOP)
-
-#define OUTER_WRITE_LOOP 10U
-#define INNER_WRITE_LOOP 200U
-#define WRITE_LOOP ((unsigned long long)OUTER_WRITE_LOOP * INNER_WRITE_LOOP)
-
-static int num_read;
-static int num_write;
-
-#define NR_READ num_read
-#define NR_WRITE num_write
-
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
-static cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
-
-void *thr_reader(void *arg)
-{
-       int i, j;
-       struct test_array *local_ptr;
-       cycles_t time1, time2;
-
-       printf("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-       sleep(2);
-
-       rcu_register_thread();
-
-       time1 = caa_get_cycles();
-       for (i = 0; i < OUTER_READ_LOOP; i++) {
-               for (j = 0; j < INNER_READ_LOOP; j++) {
-                       _rcu_read_lock();
-                       local_ptr = _rcu_dereference(test_rcu_pointer);
-                       if (local_ptr) {
-                               assert(local_ptr->a == 8);
-                       }
-                       _rcu_read_unlock();
-               }
-               _rcu_quiescent_state();
-       }
-       time2 = caa_get_cycles();
-
-       rcu_unregister_thread();
-
-       reader_time[(unsigned long)arg] = time2 - time1;
-
-       sleep(2);
-       printf("thread_end %s, thread id : %lx, tid %lu\n",
-                       "reader", pthread_self(), (unsigned long)gettid());
-       return ((void*)1);
-
-}
-
-void *thr_writer(void *arg)
-{
-       int i, j;
-       struct test_array *new, *old;
-       cycles_t time1, time2;
-
-       printf("thread_begin %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-       sleep(2);
-
-       for (i = 0; i < OUTER_WRITE_LOOP; i++) {
-               for (j = 0; j < INNER_WRITE_LOOP; j++) {
-                       time1 = caa_get_cycles();
-                       new = malloc(sizeof(struct test_array));
-                       rcu_copy_mutex_lock();
-                       old = test_rcu_pointer;
-                       if (old) {
-                               assert(old->a == 8);
-                       }
-                       new->a = 8;
-                       old = rcu_xchg_pointer(&test_rcu_pointer, new);
-                       rcu_copy_mutex_unlock();
-                       synchronize_rcu();
-                       /* can be done after unlock */
-                       if (old) {
-                               old->a = 0;
-                       }
-                       free(old);
-                       time2 = caa_get_cycles();
-                       writer_time[(unsigned long)arg] += time2 - time1;
-                       usleep(1);
-               }
-       }
-
-       printf("thread_end %s, thread id : %lx, tid %lu\n",
-                       "writer", pthread_self(), (unsigned long)gettid());
-       return ((void*)2);
-}
-
-int main(int argc, char **argv)
-{
-       int err;
-       pthread_t *tid_reader, *tid_writer;
-       void *tret;
-       int i;
-       cycles_t tot_rtime = 0;
-       cycles_t tot_wtime = 0;
-
-       if (argc < 2) {
-               printf("Usage : %s nr_readers nr_writers\n", argv[0]);
-               exit(-1);
-       }
-       num_read = atoi(argv[1]);
-       num_write = atoi(argv[2]);
-
-       reader_time = malloc(sizeof(*reader_time) * num_read);
-       writer_time = malloc(sizeof(*writer_time) * num_write);
-       tid_reader = malloc(sizeof(*tid_reader) * num_read);
-       tid_writer = malloc(sizeof(*tid_writer) * num_write);
-
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
-                       "main", pthread_self(), (unsigned long)gettid());
-
-       for (i = 0; i < NR_READ; i++) {
-               err = pthread_create(&tid_reader[i], NULL, thr_reader,
-                                    (void *)(long)i);
-               if (err != 0)
-                       exit(1);
-       }
-       for (i = 0; i < NR_WRITE; i++) {
-               err = pthread_create(&tid_writer[i], NULL, thr_writer,
-                                    (void *)(long)i);
-               if (err != 0)
-                       exit(1);
-       }
-
-       sleep(10);
-
-       for (i = 0; i < NR_READ; i++) {
-               err = pthread_join(tid_reader[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_rtime += reader_time[i];
-       }
-       for (i = 0; i < NR_WRITE; i++) {
-               err = pthread_join(tid_writer[i], &tret);
-               if (err != 0)
-                       exit(1);
-               tot_wtime += writer_time[i];
-       }
-       free(test_rcu_pointer);
-       printf("Time per read : %g cycles\n",
-              (double)tot_rtime / ((double)NR_READ * (double)READ_LOOP));
-       printf("Time per write : %g cycles\n",
-              (double)tot_wtime / ((double)NR_WRITE * (double)WRITE_LOOP));
-
-       free(reader_time);
-       free(writer_time);
-       free(tid_reader);
-       free(tid_writer);
-
-       return 0;
-}
This page took 0.039255 seconds and 4 git commands to generate.