X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=test_perthreadlock.c;h=3d1d9ec1e46581d62d22614223672d9f2cc914d7;hp=2c95590170dc63fdadcf0b493b88554582fa5aba;hb=4bad7d45799f5856cc14425aa7ddb2e111a3c5b7;hpb=900e541e6604a92bdf268074bb41ec6b6632d4eb

diff --git a/test_perthreadlock.c b/test_perthreadlock.c
index 2c95590..3d1d9ec 100644
--- a/test_perthreadlock.c
+++ b/test_perthreadlock.c
@@ -84,6 +84,14 @@ static inline void loop_sleep(unsigned long l)
 		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.
  */
@@ -133,7 +141,7 @@ void *thr_reader(void *data)
 {
 	unsigned long tidx = (unsigned long)data;
 
-	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)
@@ -163,7 +171,7 @@ void *thr_writer(void *data)
 	unsigned long wtidx = (unsigned long)data;
 	long tidx;
 
-	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)
@@ -187,7 +195,7 @@ void *thr_writer(void *data)
 			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());
 	tot_nr_writes[wtidx] = nr_writes;
 	return ((void*)2);
@@ -201,6 +209,7 @@ void show_usage(int argc, char **argv)
 #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");
 }
@@ -263,7 +272,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) {
@@ -279,14 +288,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("Reader duration : %lu loops.\n", rduration);
-	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
@@ -336,9 +348,15 @@ int main(int argc, char **argv)
 			exit(1);
 		tot_writes += tot_nr_writes[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 %s testdur %lu nr_readers %u rdur %lu nr_writers %u "
+		"wdelay %u nr_reads %llu nr_writes %llu nr_ops %llu\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);