diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 21:14:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 21:14:04 +0100 |
commit | 87968f94fbea47df334502a0db645833ce8a848b (patch) | |
tree | a8acb87cf151aed23aa0f64d2f78567b6eaffc75 /tools/perf/builtin-report.c | |
parent | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (diff) | |
parent | 6d862b8c14ba539c7c87ffc77f2e1d6dc9630c4d (diff) | |
download | op-kernel-dev-87968f94fbea47df334502a0db645833ce8a848b.zip op-kernel-dev-87968f94fbea47df334502a0db645833ce8a848b.tar.gz |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Add new COMM infrastructure, further improving histogram processing, from
Frédéric Weisbecker, one fix from Namhyung Kim.
* Enhance option parse error message, showing just the help lines of the
options affected, from Namhyung Kim.
* Fixup PERF_SAMPLE_TRANSACTION handling in sample synthesizing and
'perf test', from Adrian Hunter.
* Set up output options for in-stream attributes, from Adrian Hunter.
* Fix 32-bit cross build, from Adrian Hunter.
* Fix libunwind build and feature detection for 32-bit build, from Adrian Hunter.
* Always use perf_evsel__set_sample_bit to set sample_type, from Adrian Hunter.
perf evlist: Add a debug print if event buffer mmap fails
* Add missing data.h into LIB_H headers, fix from Jiri Olsa.
* libtraceevent updates from upstream trace-cmd repo, from Steven Rostedt.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 98d3891..25f83d5 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -905,13 +905,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) input_name = "perf.data"; } - if (strcmp(input_name, "-") != 0) - setup_browser(true); - else { - use_browser = 0; - perf_hpp__init(); - } - file.path = input_name; file.force = report.force; @@ -954,8 +947,22 @@ repeat: sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked"; } - if (setup_sorting() < 0) - usage_with_options(report_usage, options); + if (setup_sorting() < 0) { + parse_options_usage(report_usage, options, "s", 1); + goto error; + } + + if (parent_pattern != default_parent_pattern) { + if (sort_dimension__add("parent") < 0) + goto error; + } + + if (strcmp(input_name, "-") != 0) + setup_browser(true); + else { + use_browser = 0; + perf_hpp__init(); + } /* * Only in the TUI browser we are doing integrated annotation, @@ -986,11 +993,6 @@ repeat: if (symbol__init() < 0) goto error; - if (parent_pattern != default_parent_pattern) { - if (sort_dimension__add("parent") < 0) - goto error; - } - if (argc) { /* * Special case: if there's an argument left then assume that |