X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=test_rwlock.c;h=4ec427b8be469e14f3f46b511b7d5744cc114d49;hp=76156cb01064e335b729be9458f0fdd9a0720c16;hb=8b632babd61dd1708c4cf95f1f417469f8f6a528;hpb=78efb485e9baa0408e8d96932a68784bc19e59a5

diff --git a/test_rwlock.c b/test_rwlock.c
index 76156cb..4ec427b 100644
--- 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,13 @@ 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 us */
+static unsigned long rduration;
+
 /*
  * returns 0 if test should end.
  */
@@ -125,9 +130,11 @@ void *thr_reader(void *_count)
 	for (;;) {
 		pthread_rwlock_rdlock(&lock);
 		assert(test_array.a == 8);
+		if (unlikely(rduration))
+			usleep(rduration);
 		pthread_rwlock_unlock(&lock);
 		nr_reads++;
-		if (!test_duration_read())
+		if (unlikely(!test_duration_read()))
 			break;
 	}
 
@@ -152,12 +159,13 @@ 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);
 	}
 
@@ -174,9 +182,13 @@ 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 (us))");
+	printf(" [-a cpu#] [-a cpu#]... (affinity)");
 	printf("\n");
 }
 
+cpu_set_t affinity;
+
 int main(int argc, char **argv)
 {
 	int err;
@@ -184,7 +196,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 +223,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 +237,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("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);
@@ -237,6 +269,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);