Align the summary result

[urcu.git] / test_rwlock.c

diff --git a/test_rwlock.c b/test_rwlock.c
index 76156cb01064e335b729be9458f0fdd9a0720c16..e7797638e0571053b4f62dd4b8d0171a6c266531 100644 (file)
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -30,6 +31,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <sys/syscall.h>
+#include <sched.h>
 
 #include "arch.h"
 
@@ -65,10 +67,27 @@ static volatile int test_go, test_stop;
 
 static int wdelay;
 
-static struct test_array test_array = { 8 };
+static volatile struct test_array test_array = { 8 };
 
 static unsigned long duration;
 
+/* read-side C.S. duration, in loops */
+static unsigned long rduration;
+
+static inline void loop_sleep(unsigned long l)
+{
+       while(l-- != 0)
+               cpu_relax();
+}
+
+static int verbose_mode;
+
+#define printf_verbose(fmt, args...)           \
+       do {                                    \
+               if (verbose_mode)               \
+                       printf(fmt, args);      \
+       } while (0)
+
 /*
  * returns 0 if test should end.
  */
@@ -115,7 +134,7 @@ void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
 
-       printf("thread_begin %s, thread id : %lx, tid %lu\n",
+       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
                        "reader", pthread_self(), (unsigned long)gettid());
 
        while (!test_go)
@@ -125,14 +144,16 @@ void *thr_reader(void *_count)
        for (;;) {
                pthread_rwlock_rdlock(&lock);
                assert(test_array.a == 8);
+               if (unlikely(rduration))
+                       loop_sleep(rduration);
                pthread_rwlock_unlock(&lock);
                nr_reads++;
-               if (!test_duration_read())
+               if (unlikely(!test_duration_read()))
                        break;
        }
 
        *count = nr_reads;
-       printf("thread_end %s, thread id : %lx, tid %lu\n",
+       printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
                        "reader", pthread_self(), (unsigned long)gettid());
        return ((void*)1);
 
@@ -142,7 +163,7 @@ void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
 
-       printf("thread_begin %s, thread id : %lx, tid %lu\n",
+       printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
                        "writer", pthread_self(), (unsigned long)gettid());
 
        while (!test_go)
@@ -152,16 +173,17 @@ void *thr_writer(void *_count)
 
        for (;;) {
                pthread_rwlock_wrlock(&lock);
+               test_array.a = 0;
                test_array.a = 8;
                pthread_rwlock_unlock(&lock);
                nr_writes++;
-               if (!test_duration_write())
+               if (unlikely(!test_duration_write()))
                        break;
-               if (wdelay)
+               if (unlikely(wdelay))
                        usleep(wdelay);
        }
 
-       printf("thread_end %s, thread id : %lx, tid %lu\n",
+       printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
                        "writer", pthread_self(), (unsigned long)gettid());
        *count = nr_writes;
        return ((void*)2);
@@ -174,9 +196,14 @@ void show_usage(int argc, char **argv)
        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(" [-v] (verbose output)");
+       printf(" [-a cpu#] [-a cpu#]... (affinity)");
        printf("\n");
 }
 
+cpu_set_t affinity;
+
 int main(int argc, char **argv)
 {
        int err;
@@ -184,7 +211,8 @@ int main(int argc, char **argv)
        void *tret;
        unsigned long long *count_reader, *count_writer;
        unsigned long long tot_reads = 0, tot_writes = 0;
-       int i;
+       int i, a;
+       int use_affinity = 0;
 
        if (argc < 4) {
                show_usage(argc, argv);
@@ -210,6 +238,8 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       CPU_ZERO(&affinity);
+
        for (i = 4; i < argc; i++) {
                if (argv[i][0] != '-')
                        continue;
@@ -222,6 +252,23 @@ int main(int argc, char **argv)
                        yield_active |= YIELD_WRITE;
                        break;
 #endif
+               case 'a':
+                       if (argc < i + 2) {
+                               show_usage(argc, argv);
+                               return -1;
+                       }
+                       a = atoi(argv[++i]);
+                       CPU_SET(a, &affinity);
+                       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 = atoi(argv[++i]);
+                       break;
                case 'd':
                        if (argc < i + 2) {
                                show_usage(argc, argv);
@@ -229,14 +276,23 @@ int main(int argc, char **argv)
                        }
                        wdelay = atoi(argv[++i]);
                        break;
+               case 'v':
+                       verbose_mode = 1;
+                       break;
                }
        }
 
-       printf("running test for %lu seconds, %u readers, %u writers.\n",
+       printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
                duration, nr_readers, nr_writers);
-       printf("Writer delay : %u us.\n", wdelay);
-       printf("thread %-6s, thread id : %lx, tid %lu\n",
+       printf_verbose("Writer delay : %u us.\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());
+       if (use_affinity
+           && sched_setaffinity(0, sizeof(affinity), &affinity) < 0) {
+               perror("sched_setaffinity");
+               exit(-1);
+       }
 
        tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
        tid_writer = malloc(sizeof(*tid_writer) * nr_writers);
@@ -276,9 +332,16 @@ int main(int argc, char **argv)
                        exit(1);
                tot_writes += count_writer[i];
        }
-       
-       printf("total number of reads : %llu, writes %llu\n", tot_reads,
+
+       printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
               tot_writes);
+       printf("SUMMARY %-15s testdur %4lu nr_readers %3u rdur %6lu "
+               "nr_writers %3u "
+               "wdelay %4u nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
+               argv[0], duration, nr_readers, rduration,
+               nr_writers, wdelay, tot_reads, tot_writes,
+               tot_reads + tot_writes);
+
        free(tid_reader);
        free(tid_writer);
        free(count_reader);