perf test: Make the rdpmc test honour 'verbose' mode

It was unconditionally printing debug stuff when in non -v mode we
should just print the name and result of the test.

Now:

[root@sandy ~]# perf test rdpmc
 6: x86 rdpmc test: Ok
[root@sandy ~]# perf test -v rdpmc
 6: x86 rdpmc test:
--- start ---
             0:           6030
             1:          60030
             2:         600050
             3:        6000056
             4:       60000070
             5:      600000266
   ---- end ----
x86 rdpmc test: Ok
[root@sandy ~]#

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-0tjedaozsy9oarq30nvzg74b@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f3054c77
...@@ -1549,8 +1549,6 @@ static int __test__rdpmc(void) ...@@ -1549,8 +1549,6 @@ static int __test__rdpmc(void)
sa.sa_sigaction = segfault_handler; sa.sa_sigaction = segfault_handler;
sigaction(SIGSEGV, &sa, NULL); sigaction(SIGSEGV, &sa, NULL);
fprintf(stderr, "\n\n");
fd = sys_perf_event_open(&attr, 0, -1, -1, 0); fd = sys_perf_event_open(&attr, 0, -1, -1, 0);
if (fd < 0) { if (fd < 0) {
die("Error: sys_perf_event_open() syscall returned " die("Error: sys_perf_event_open() syscall returned "
...@@ -1575,7 +1573,7 @@ static int __test__rdpmc(void) ...@@ -1575,7 +1573,7 @@ static int __test__rdpmc(void)
loops *= 10; loops *= 10;
delta = now - stamp; delta = now - stamp;
fprintf(stderr, "%14d: %14Lu\n", n, (long long)delta); pr_debug("%14d: %14Lu\n", n, (long long)delta);
delta_sum += delta; delta_sum += delta;
} }
...@@ -1583,7 +1581,7 @@ static int __test__rdpmc(void) ...@@ -1583,7 +1581,7 @@ static int __test__rdpmc(void)
munmap(addr, page_size); munmap(addr, page_size);
close(fd); close(fd);
fprintf(stderr, " "); pr_debug(" ");
if (!delta_sum) if (!delta_sum)
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment