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

diff --git a/test_rwlock.c b/test_rwlock.c
index 4ec427b..e779763 100644
--- a/test_rwlock.c
+++ b/test_rwlock.c
@@ -71,9 +71,23 @@ static volatile struct test_array test_array = { 8 };
 
 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)
+
 /*
  * returns 0 if test should end.
  */
@@ -120,7 +134,7 @@ void *thr_reader(void *_count)
 {
 	unsigned long long *count = _count;
 
-	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());
 
 	while (!test_go)
@@ -131,7 +145,7 @@ void *thr_reader(void *_count)
 		pthread_rwlock_rdlock(&lock);
 		assert(test_array.a == 8);
 		if (unlikely(rduration))
-			usleep(rduration);
+			loop_sleep(rduration);
 		pthread_rwlock_unlock(&lock);
 		nr_reads++;
 		if (unlikely(!test_duration_read()))
@@ -139,7 +153,7 @@ void *thr_reader(void *_count)
 	}
 
 	*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);
 
@@ -149,7 +163,7 @@ void *thr_writer(void *_count)
 {
 	unsigned long long *count = _count;
 
-	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());
 
 	while (!test_go)
@@ -169,7 +183,7 @@ void *thr_writer(void *_count)
 			usleep(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);
@@ -182,7 +196,8 @@ 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");
 }
@@ -245,7 +260,7 @@ int main(int argc, char **argv)
 			a = atoi(argv[++i]);
 			CPU_SET(a, &affinity);
 			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) {
@@ -261,13 +276,17 @@ int main(int argc, char **argv)
 			}
 			wdelay = atoi(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 : %u us.\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) {
@@ -313,9 +332,16 @@ int main(int argc, char **argv)
 			exit(1);
 		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 %-15s testdur %4lu nr_readers %3u rdur %6lu "
+		"nr_writers %3u "
+		"wdelay %4u 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);
+
 	free(tid_reader);
 	free(tid_writer);
 	free(count_reader);