fix runtests.sh

[urcu.git] / test_rwlock.c

diff --git a/test_rwlock.c b/test_rwlock.c
index 9a818ffe5b2fba416d27eec87773178d7088ea09..0fdaad60b9871641d30b7e1eca3007f3ff07ad06 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,9 @@
 #include <stdio.h>
 #include <assert.h>
 #include <sys/syscall.h>
+#include <sched.h>
+
+#include "arch.h"
 
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
@@ -59,39 +63,25 @@ struct test_array {
 
 pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
 
-static volatile int test_go;
+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;
-static time_t start_time;
-static unsigned long __thread duration_interval;
-#define DURATION_TEST_DELAY_WRITE 4
-#define DURATION_TEST_DELAY_READ 100
 
 /*
  * returns 0 if test should end.
  */
 static int test_duration_write(void)
 {
-       if (duration_interval++ >= DURATION_TEST_DELAY_WRITE) {
-               duration_interval = 0;
-               if (time(NULL) - start_time >= duration)
-                       return 0;
-       }
-       return 1;
+       return !test_stop;
 }
 
 static int test_duration_read(void)
 {
-       if (duration_interval++ >= DURATION_TEST_DELAY_READ) {
-               duration_interval = 0;
-               if (time(NULL) - start_time >= duration)
-                       return 0;
-       }
-       return 1;
+       return !test_stop;
 }
 
 static unsigned long long __thread nr_writes;
@@ -139,7 +129,7 @@ void *thr_reader(void *_count)
                assert(test_array.a == 8);
                pthread_rwlock_unlock(&lock);
                nr_reads++;
-               if (!test_duration_read())
+               if (unlikely(!test_duration_read()))
                        break;
        }
 
@@ -160,15 +150,17 @@ void *thr_writer(void *_count)
        while (!test_go)
        {
        }
+       smp_mb();
 
        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);
        }
 
@@ -184,10 +176,13 @@ void show_usage(int argc, char **argv)
 #ifdef DEBUG_YIELD
        printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
-       printf(" [-d delay] (writer period)");
+       printf(" [-d delay] (writer period (us))");
+       printf(" [-a cpu#] [-a cpu#]... (affinity)");
        printf("\n");
 }
 
+cpu_set_t affinity;
+
 int main(int argc, char **argv)
 {
        int err;
@@ -195,12 +190,14 @@ 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);
                return -1;
        }
+       smp_mb();
 
        err = sscanf(argv[1], "%u", &nr_readers);
        if (err != 1) {
@@ -220,6 +217,8 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       CPU_ZERO(&affinity);
+
        for (i = 4; i < argc; i++) {
                if (argv[i][0] != '-')
                        continue;
@@ -232,6 +231,16 @@ 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("Adding CPU %d affinity\n", a);
+                       break;
                case 'd':
                        if (argc < i + 2) {
                                show_usage(argc, argv);
@@ -245,9 +254,13 @@ int main(int argc, char **argv)
        printf("running test for %lu seconds, %u readers, %u writers.\n",
                duration, nr_readers, nr_writers);
        printf("Writer delay : %u us.\n", wdelay);
-       start_time = time(NULL);
        printf("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);
@@ -267,8 +280,14 @@ int main(int argc, char **argv)
                        exit(1);
        }
 
+       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)