X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=test_qsbr.c;h=ed95759281fea78170619920dacc86074ed1687d;hb=6a190115015916c037e35fb94ec1fa35c33a0d0c;hp=f56234b564c8bac4a6d01ff1b2eede53beba3e0f;hpb=9e97e4783f9b20f5d261d12acb4980b1908aa5cd;p=urcu.git

diff --git a/test_qsbr.c b/test_qsbr.c
index f56234b..ed95759 100644
--- a/test_qsbr.c
+++ b/test_qsbr.c
@@ -65,6 +65,23 @@ static struct test_array *test_rcu_pointer;
 
 static unsigned long duration;
 
+/* 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.
  */
@@ -148,7 +165,7 @@ 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());
 
 	rcu_register_thread();
@@ -164,6 +181,8 @@ void *thr_reader(void *_count)
 		debug_yield_read();
 		if (local_ptr)
 			assert(local_ptr->a == 8);
+		if (unlikely(rduration))
+			loop_sleep(rduration);
 		_rcu_read_unlock();
 		nr_reads++;
 		/* QS each 1024 reads */
@@ -176,7 +195,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);
 
@@ -187,7 +206,7 @@ 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());
 
 	while (!test_go)
@@ -215,7 +234,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);
@@ -228,6 +247,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 (in loops))");
+	printf(" [-v] (verbose output)");
 	printf(" [-a cpu#] [-a cpu#]... (affinity)");
 	printf("\n");
 }
@@ -289,7 +310,14 @@ 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) {
+				show_usage(argc, argv);
+				return -1;
+			}
+			rduration = atoi(argv[++i]);
 			break;
 		case 'd':
 			if (argc < i + 2) {
@@ -298,13 +326,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
@@ -353,8 +385,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 %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);
 	test_array_free(test_rcu_pointer);
 	free(test_array);
 	free(tid_reader);