Messages in this thread Patch in this message | | | Date | Mon, 12 Mar 2012 21:50:40 -0700 | From | tip-bot for Stephane Eranian <> | Subject | [tip:perf/core] perf report: Remove duplicate annotate choice in branch view mode |
| |
Commit-ID: 8bcd65fd29e9abfb633bfd6eedaf24b22e211f3a Gitweb: http://git.kernel.org/tip/8bcd65fd29e9abfb633bfd6eedaf24b22e211f3a Author: Stephane Eranian <eranian@google.com> AuthorDate: Mon, 12 Mar 2012 16:13:29 +0100 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 12 Mar 2012 20:46:16 +0100
perf report: Remove duplicate annotate choice in branch view mode
This patch removes the duplicated annotate selection when browsing in branch view mode. If the sym and dso oof the branch source and target are the same, then only one annotate choice is proposed.
Signed-off-by: Stephane Eranian <eranian@google.com> Cc: peterz@infradead.org Cc: acme@redhat.com Cc: asharma@fb.com Cc: ravitillo@lbl.gov Cc: vweaver1@eecs.utk.edu Cc: khandual@linux.vnet.ibm.com Cc: dsahern@gmail.com Link: http://lkml.kernel.org/r/1331565210-10865-2-git-send-email-eranian@google.com Signed-off-by: Ingo Molnar <mingo@elte.hu> --- tools/perf/util/ui/browsers/hists.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c index 951e2e9..40fd424 100644 --- a/tools/perf/util/ui/browsers/hists.c +++ b/tools/perf/util/ui/browsers/hists.c @@ -989,6 +989,8 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, bi && bi->to.sym != NULL && !bi->to.map->dso->annotate_warned && + (bi->to.sym != bi->from.sym || + bi->to.map->dso != bi->from.map->dso) && asprintf(&options[nr_options], "Annotate %s", bi->to.sym->name) > 0) annotate_t = nr_options++;
| |