perf stat: Don' t show counter information when workload fails
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 6af206fd911c825b83dd4efb2534a3a34ce77072 Gitweb: http://git.kernel.org/tip/6af206fd911c825b83dd4efb2534a3a34ce77072 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 28 Dec 2013 15:45:08 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 13 Jan 2014 10:06:21 -0300
perf stat: Don't show counter information when workload fails
When starting a workload 'stat' wasn't using prepare_workload evlist method's signal based exec() error reporting mechanism.
Use it so that the we don't report 'not counted' counters.
Before:
[acme@zoo linux]$ perf stat dfadsfa
dfadsfa: No such file or directory
Performance counter stats for 'dfadsfa':
<not counted> task-clock
<not counted> context-switches
<not counted> cpu-migrations
<not counted> page-faults
<not counted> cycles
<not counted> stalled-cycles-frontend
<not supported> stalled-cycles-backend
<not counted> instructions
<not counted> branches
<not counted> branch-misses0.001831462 seconds time elapsed
[acme@zoo linux]$
After:
[acme@zoo linux]$ perf stat dfadsfa
dfadsfa: No such file or directory
[acme@zoo linux]$
Reported-by David Ahern <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[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-stat.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
tools/perf/builtin-stat.c +25 -1
@@ -509,6 +509,18 @@ static void handle_initial_delay(void) } } +static volatile bool workload_exec_failed; + +/* +* perf_evlist__prepare_workload will send a SIGUSR1 +* if the fork fails, since we asked by setting its +* want_signal to true. +*/ +static void workload_exec_failed_signal (int signo__maybe_unused ) +{ + workload_exec_failed = true; +} +static int __run_perf_stat (int argc,const char **argv) {char msg[512 ];
@@ -529,7 +541,7 @@ static int __run_perf_stat(int argc, const char **argv)if (forks) {if (perf_evlist__prepare_workload (evsel_list, &target, argv, - false, false) <0 ) { + false, true) <0 ) {perror ("failed to prepare workload" );return -1 ; }
@@ -584,6 +596,14 @@ static int __run_perf_stat(int argc, const char **argv)clock_gettime (CLOCK_MONOTONIC , &ref_time);if (forks) { +/* +* perf_evlist__prepare_workload will, after we call +* perf_evlist__start_Workload, send a SIGUSR1 if the exec call +* fails, that we will catch in workload_signal to flip +* workload_exec_failed. +*/ +signal (SIGUSR1 , workload_exec_failed_signal); +perf_evlist__start_workload (evsel_list);handle_initial_delay ();
@@ -594,6 +614,10 @@ static int __run_perf_stat(int argc, const char **argv) } }wait (&status); + +if (workload_exec_failed) +return -1 ; +if (WIFSIGNALED (status))psignal (WTERMSIG (status), argv[0 ]); }else {