X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=test_urcu.c;h=3feda89e49a45f2edff66a7bbab5fbab6c7d27f7;hp=85f4a36ce8e1eb3a35a62854b916ff9b284ced50;hb=538d7df5086144837beb7a9c1e2a94eb637b9904;hpb=8b632babd61dd1708c4cf95f1f417469f8f6a528

diff --git a/test_urcu.c b/test_urcu.c
index 85f4a36..3feda89 100644
--- a/test_urcu.c
+++ b/test_urcu.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)
@@ -63,15 +69,60 @@ struct test_array {
 
 static volatile int test_go, test_stop;
 
-static int wdelay;
+static unsigned long wdelay;
 
 static struct test_array *test_rcu_pointer;
 
 static unsigned long duration;
 
-/* read-side C.S. duration, in us */
+/* 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)
+
+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.
  */
@@ -155,9 +206,11 @@ void *thr_reader(void *_count)
 	unsigned long long *count = _count;
 	struct test_array *local_ptr;
 
-	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());
 
+	set_affinity();
+
 	rcu_register_thread();
 
 	while (!test_go)
@@ -172,7 +225,7 @@ void *thr_reader(void *_count)
 		if (local_ptr)
 			assert(local_ptr->a == 8);
 		if (unlikely(rduration))
-			usleep(rduration);
+			loop_sleep(rduration);
 		rcu_read_unlock();
 		nr_reads++;
 		if (unlikely(!test_duration_read()))
@@ -182,7 +235,7 @@ void *thr_reader(void *_count)
 	rcu_unregister_thread();
 
 	*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);
 
@@ -193,9 +246,11 @@ void *thr_writer(void *_count)
 	unsigned long long *count = _count;
 	struct test_array *new, *old;
 
-	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());
 
+	set_affinity();
+
 	while (!test_go)
 	{
 	}
@@ -203,14 +258,8 @@ void *thr_writer(void *_count)
 
 	for (;;) {
 		new = test_array_alloc();
-		rcu_copy_mutex_lock();
-		old = test_rcu_pointer;
-		if (old)
-			assert(old->a == 8);
 		new->a = 8;
 		old = rcu_publish_content(&test_rcu_pointer, new);
-		rcu_copy_mutex_unlock();
-		/* can be done after unlock */
 		if (old)
 			old->a = 0;
 		test_array_free(old);
@@ -218,10 +267,10 @@ void *thr_writer(void *_count)
 		if (unlikely(!test_duration_write()))
 			break;
 		if (unlikely(wdelay))
-			usleep(wdelay);
+			loop_sleep(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);
@@ -234,13 +283,12 @@ 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(" [-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;
@@ -249,7 +297,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);
@@ -274,8 +321,6 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	CPU_ZERO(&affinity);
-
 	for (i = 4; i < argc; i++) {
 		if (argv[i][0] != '-')
 			continue;
@@ -294,45 +339,45 @@ 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("Adding CPU %d affinity\n", a);
+			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]);
+			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;
 			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 : %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);
-	}
-
 	test_array = malloc(sizeof(*test_array) * ARRAY_SIZE);
 	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]);
@@ -367,8 +412,14 @@ int main(int argc, char **argv)
 		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 %-25s testdur %4lu nr_readers %3u rdur %6lu "
+		"nr_writers %3u "
+		"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);
 	test_array_free(test_rcu_pointer);
 	free(test_array);
 	free(tid_reader);