Add set affinity -a option to tests

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/runtests.sh b/runtests.sh
index a3844184a8d5a71378659c2e534f27d760919be4..7b20d26a05ec7c6afce305924615ca7778e0f39a 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -4,5 +4,5 @@
 
 for a in test_urcu test_urcu_mb test_qsbr test_rwlock test_perthreadlock; do
        echo Executing $a
-       ./${a} $* |grep "total num"
+       ./${a} $*
 done

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 3684975eebf7c85312cd3a6a2322f88af03c022c..4f46d23c9da84fca94a8c7fe40ca2c44a585b119 100644 (file)
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.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"
 
@@ -187,9 +189,12 @@ void show_usage(int argc, char **argv)
        printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
        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;
@@ -197,7 +202,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);
@@ -223,6 +229,8 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       CPU_ZERO(&affinity);
+
        for (i = 4; i < argc; i++) {
                if (argv[i][0] != '-')
                        continue;
@@ -235,6 +243,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);
@@ -251,6 +269,12 @@ int main(int argc, char **argv)
        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);
        count_reader = malloc(sizeof(*count_reader) * nr_readers);

diff --git a/test_qsbr.c b/test_qsbr.c
index 82521efcf83a9babbf743f7741ad05a473efabb6..f56234b564c8bac4a6d01ff1b2eede53beba3e0f 100644 (file)
--- a/test_qsbr.c
+++ b/test_qsbr.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"
 
@@ -226,9 +228,12 @@ void show_usage(int argc, char **argv)
        printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
        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;
@@ -236,7 +241,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);
@@ -261,6 +267,8 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       CPU_ZERO(&affinity);
+
        for (i = 4; i < argc; i++) {
                if (argv[i][0] != '-')
                        continue;
@@ -273,6 +281,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);
@@ -289,6 +307,12 @@ int main(int argc, char **argv)
        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);
+       }
+
        test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
        tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
        tid_writer = malloc(sizeof(*tid_writer) * nr_writers);

diff --git a/test_rwlock.c b/test_rwlock.c
index 1c29d73839adaec693c53a2315c8e0cd8a2a1be0..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,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <sys/syscall.h>
+#include <sched.h>
 
 #include "arch.h"
 
@@ -175,9 +177,12 @@ void show_usage(int argc, char **argv)
        printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
        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;
@@ -185,7 +190,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);
@@ -211,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;
@@ -223,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);
@@ -238,6 +256,11 @@ int main(int argc, char **argv)
        printf("Writer delay : %u us.\n", wdelay);
        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);

diff --git a/test_urcu.c b/test_urcu.c
index 58612815f3c2bbd4882593edf549f935f152593e..016fa3f6c70ac2f7aa7c6c74cef1225493d6b1fa 100644 (file)
--- a/test_urcu.c
+++ b/test_urcu.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"
 
@@ -227,9 +229,12 @@ void show_usage(int argc, char **argv)
        printf(" [-r] [-w] (yield reader and/or writer)");
 #endif
        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;
@@ -237,7 +242,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);
@@ -262,6 +268,8 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       CPU_ZERO(&affinity);
+
        for (i = 4; i < argc; i++) {
                if (argv[i][0] != '-')
                        continue;
@@ -274,6 +282,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);
@@ -290,6 +308,12 @@ int main(int argc, char **argv)
        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);
+       }
+
        test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
        tid_reader = malloc(sizeof(*tid_reader) * nr_readers);
        tid_writer = malloc(sizeof(*tid_writer) * nr_writers);