perf test: Make the rdpmc test honour 'verbose' mode
Commit-ID: 23080e4cd224013c06444e7850fe0bcb55c129ff Gitweb: http://git.kernel.org/tip/23080e4cd224013c06444e7850fe0bcb55c129ff Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Thu, 26 Apr 2012 16:22:09 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 2 May 2012 15:14:12 -0300
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 <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-test.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
tools/perf/builtin-test.c +2 -4
@@ -1549,8 +1549,6 @@ static int __test__rdpmc(void) sa.sa_sigaction = segfault_handler;sigaction (SIGSEGV , &sa,NULL ); -fprintf (stderr,"\n\n" ); - fd =sys_perf_event_open (&attr,0 ,-1 ,-1 ,0 );if (fd <0 ) { die("Error: sys_perf_event_open() syscall returned "
@@ -1575,7 +1573,7 @@ static int __test__rdpmc(void) loops *=10 ; delta = now - stamp; -fprintf (stderr,"%14d: %14Lu\n" , n, (long long )delta); +pr_debug ("%14d: %14Lu\n" , n, (long long )delta); delta_sum += delta; }
@@ -1583,7 +1581,7 @@ static int __test__rdpmc(void)munmap (addr, page_size);close (fd); -fprintf (stderr," " ); +pr_debug (" " );if (!delta_sum)return -1 ;