perf tools: Add --tui and --stdio to choose the UI
Commit-ID: 8b9e74eb8af808807192d16b76565c27154ae7ed Gitweb: http://git.kernel.org/tip/8b9e74eb8af808807192d16b76565c27154ae7ed Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 21 Aug 2010 10:38:16 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sat, 21 Aug 2010 10:49:46 -0300
perf tools: Add --tui and --stdio to choose the UI
Relying just on ~/.perfconfig or rebuilding the tool disabling support for the TUI is too cumbersome, so allow specifying which UI to use and make the command line switch override whatever is in ~/.perfconfig.
Suggested-by Christoph Hellwig <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/Documentation/perf-annotate.txt | 11 +++++++++-- tools/perf/Documentation/perf-report.txt | 7 +++++++ tools/perf/builtin-annotate.c | 9 ++++++++- tools/perf/builtin-report.c | 11 ++++++++++- 4 files changed, 34 insertions(+), 4 deletions(-)
tools/perf/Documentation/perf-annotate.txt +9 -2
@@ -8,7 +8,7 @@ perf-annotate - Read perf.data (created by perf record) and display annotated co SYNOPSIS -------- [verse] -'perf annotate' [-i <file> | --input=file] symbol_name +'perf annotate' [-i <file> | --input=file] [symbol_name] DESCRIPTION -----------
@@ -24,6 +24,13 @@ OPTIONS --input=:: Input file name. (default: perf.data) +--stdio:: Use the stdio interface. + +--tui:: Use the TUI interface Use of --tui requires a tty, if one is not + present, as when piping to other commands, the stdio interface is + used. This interfaces starts by centering on the line with more + samples, TAB/UNTAB cycles thru the lines with more samples. + SEE ALSO -------- -linkperf:perf-record[1] +linkperf:perf-record[1], linkperf:perf-report[1]
tools/perf/Documentation/perf-report.txt +7 -0
@@ -65,6 +65,13 @@ OPTIONS the tree is considered as a new profiled object. + Default: fractal,0.5. +--stdio:: Use the stdio interface. + +--tui:: Use the TUI interface, that is integrated with annotate and allows + zooming into DSOs or threads, among other features. Use of --tui + requires a tty, if one is not present, as when piping to other + commands, the stdio interface is used. + SEE ALSO -------- linkperf:perf-stat[1]
tools/perf/builtin-annotate.c +8 -1
@@ -28,7 +28,7 @@static char const *input_name ="perf.data" ; -static bool force; +static bool force, use_tui, use_stdio;static bool full_paths;
@@ -427,6 +427,8 @@ static const struct option options[] = { "be more verbose (show symbol address, etc)"),OPT_BOOLEAN ('D' ,"dump-raw-trace" , &dump_trace,"dump raw trace in ASCII" ), +OPT_BOOLEAN (0 ,"tui" , &use_tui,"Use the TUI interface" ), +OPT_BOOLEAN (0 ,"stdio" , &use_stdio,"Use the stdio interface" ),OPT_STRING ('k' ,"vmlinux" , &symbol_conf.vmlinux_name,"file" ,"vmlinux pathname" ), OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
@@ -442,6 +444,11 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) { argc =parse_options (argc, argv, options, annotate_usage,0 ); +if (use_stdio) + use_browser =0 ; +else if (use_tui) + use_browser =1 ; +setup_browser (); symbol_conf.priv_size =sizeof (struct sym_priv );
tools/perf/builtin-report.c +10 -1
@@ -32,7 +32,7 @@static char const *input_name ="perf.data" ; -static bool force; +static bool force, use_tui, use_stdio;static bool hide_unresolved;static bool dont_use_callchains;
@@ -450,6 +450,8 @@ static const struct option options[] = { "Show per-thread event counters"),OPT_STRING (0 ,"pretty" , &pretty_printing_style,"key" ,"pretty printing style key: normal raw" ), +OPT_BOOLEAN (0 ,"tui" , &use_tui,"Use the TUI interface" ), +OPT_BOOLEAN (0 ,"stdio" , &use_stdio,"Use the stdio interface" ),OPT_STRING ('s' ,"sort" , &sort_order,"key[,key2...]" ,"sort by key(s): pid, comm, dso, symbol, parent" ), OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
@@ -482,8 +484,15 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) { argc =parse_options (argc, argv, options, report_usage,0 ); +if (use_stdio) + use_browser =0 ; +else if (use_tui) + use_browser =1 ; +if (strcmp (input_name,"-" ) !=0 )setup_browser (); +else + use_browser =0 ;/* * Only in the newt browser we are doing integrated annotation, * so don't allocate extra space that won't be used in the stdio