X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_rwlock.c;h=4cc4c07f953dc5f1ae4d43ce96fb860bcc3f5f55;hp=e7797638e0571053b4f62dd4b8d0171a6c266531;hb=ec817b748bf0004a2948937b7d04cd26c106598a;hpb=cda3c71d5a0aca557840ae7744fa1c23ba43944e

diff --git a/test_rwlock.c b/test_rwlock.c
index e779763..4cc4c07 100644
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -35,6 +35,12 @@
 
 #include "arch.h"
 
+/* Make this big enough to include the POWER5+ L3 cacheline size of 256B */
+#define CACHE_LINE_SIZE 4096
+
+/* hardcoded number of CPUs */
+#define NR_CPUS 16384
+
 #if defined(_syscall0)
 _syscall0(pid_t, gettid)
 #elif defined(__NR_gettid)
@@ -65,7 +71,7 @@ pthread_rwlock_t lock = PTHREAD_RWLOCK_INITIALIZER;
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static volatile struct test_array test_array = { 8 };
 
@@ -88,6 +94,37 @@ static int 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;
+
+static void set_affinity(void)
+{
+	cpu_set_t mask;
+	int cpu;
+	int ret;
+
+	if (!use_affinity)
+		return;
+
+	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);
+	sched_setaffinity(0, sizeof(mask), &mask);
+}
+
 /*
  * returns 0 if test should end.
  */
@@ -137,6 +174,8 @@ void *thr_reader(void *_count)
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"reader", pthread_self(), (unsigned long)gettid());
 
+	set_affinity();
+
 	while (!test_go)
 	{
 	}
@@ -166,6 +205,8 @@ void *thr_writer(void *_count)
 	printf_verbose("thread_begin %s, thread id : %lx, tid %lu\n",
 			"writer", pthread_self(), (unsigned long)gettid());
 
+	set_affinity();
+
 	while (!test_go)
 	{
 	}
@@ -180,7 +221,7 @@ void *thr_writer(void *_count)
 		if (unlikely(!test_duration_write()))
 			break;
 		if (unlikely(wdelay))
-			usleep(wdelay);
+			loop_sleep(wdelay);
 	}
 
 	printf_verbose("thread_end %s, thread id : %lx, tid %lu\n",
@@ -202,8 +243,6 @@ void show_usage(int argc, char **argv)
 	printf("\n");
 }
 
-cpu_set_t affinity;
-
 int main(int argc, char **argv)
 {
 	int err;
@@ -212,7 +251,6 @@ int main(int argc, char **argv)
 	unsigned long long *count_reader, *count_writer;
 	unsigned long long tot_reads = 0, tot_writes = 0;
 	int i, a;
-	int use_affinity = 0;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -238,8 +276,6 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	CPU_ZERO(&affinity);
-
 	for (i = 4; i < argc; i++) {
 		if (argv[i][0] != '-')
 			continue;
@@ -258,7 +294,7 @@ int main(int argc, char **argv)
 				return -1;
 			}
 			a = atoi(argv[++i]);
-			CPU_SET(a, &affinity);
+			cpu_affinities[next_aff++] = a;
 			use_affinity = 1;
 			printf_verbose("Adding CPU %d affinity\n", a);
 			break;
@@ -267,14 +303,14 @@ int main(int argc, char **argv)
 				show_usage(argc, argv);
 				return -1;
 			}
-			rduration = atoi(argv[++i]);
+			rduration = atol(argv[++i]);
 			break;
 		case 'd':
 			if (argc < i + 2) {
 				show_usage(argc, argv);
 				return -1;
 			}
-			wdelay = atoi(argv[++i]);
+			wdelay = atol(argv[++i]);
 			break;
 		case 'v':
 			verbose_mode = 1;
@@ -284,21 +320,18 @@ int main(int argc, char **argv)
 
 	printf_verbose("running test for %lu seconds, %u readers, %u writers.\n",
 		duration, nr_readers, nr_writers);
-	printf_verbose("Writer delay : %u us.\n", wdelay);
+	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());
-	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);
 	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]);
@@ -335,9 +368,9 @@ int main(int argc, char **argv)
 
 	printf_verbose("total number of reads : %llu, writes %llu\n", tot_reads,
 	       tot_writes);
-	printf("SUMMARY %-15s testdur %4lu nr_readers %3u rdur %6lu "
+	printf("SUMMARY %-25s testdur %4lu nr_readers %3u rdur %6lu "
 		"nr_writers %3u "
-		"wdelay %4u nr_reads %12llu nr_writes %12llu nr_ops %12llu\n",
+		"wdelay %6lu 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);