diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2015-09-25 16:15:40 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-09-28 16:54:21 -0300 |
| commit | c7eced63f2f67bd06ceb2269062416db9d81d29d (patch) | |
| tree | 2909d817babaadc22519f4752c36971ba353ddbd | |
| parent | 601897b54c7ed492a89b262dccd7c6f7faf12b30 (diff) | |
| download | linux-stable-c7eced63f2f67bd06ceb2269062416db9d81d29d.tar.gz linux-stable-c7eced63f2f67bd06ceb2269062416db9d81d29d.tar.bz2 linux-stable-c7eced63f2f67bd06ceb2269062416db9d81d29d.zip | |
perf report: Adjust sample type validation for synthesized branch stacks
perf report looks at event sample types to determine if branch stacks
have been sampled. Adjust the validation to know about instruction
tracing options.
This change allows the use of the -b option which otherwise would
complain with an error like:
Error:
Selected -b but no branch data. Did you call perf record without -b?
# To display the perf.data header info,
# please use --header/--header-only options.
#
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1443186956-18718-10-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/builtin-report.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 0d53b485a87b..7af35af5a5e5 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -220,6 +220,9 @@ static int report__setup_sample_type(struct report *rep) !session->itrace_synth_opts->set)) sample_type |= PERF_SAMPLE_CALLCHAIN; + if (session->itrace_synth_opts->last_branch) + sample_type |= PERF_SAMPLE_BRANCH_STACK; + if (!is_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) { if (sort__has_parent) { ui__error("Selected --sort parent, but no " |