From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751768AbbCVKE4 (ORCPT ); Sun, 22 Mar 2015 06:04:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56772 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbbCVKEy (ORCPT ); Sun, 22 Mar 2015 06:04:54 -0400 Date: Sun, 22 Mar 2015 03:04:26 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dzickus@redhat.com, tglx@linutronix.de, mingo@kernel.org, eranian@google.com, acme@redhat.com, jolsa@redhat.com, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@suse.de, adrian.hunter@intel.com, dsahern@gmail.com, fweisbec@gmail.com Reply-To: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, bp@suse.de, hpa@zytor.com, fweisbec@gmail.com, dsahern@gmail.com, tglx@linutronix.de, dzickus@redhat.com, acme@redhat.com, namhyung@kernel.org, jolsa@redhat.com, mingo@kernel.org, eranian@google.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Simplify symbol annotation menu setup Git-Commit-ID: 0ba332f70a555548430ef3cf459b5240df0ffbd5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0ba332f70a555548430ef3cf459b5240df0ffbd5 Gitweb: http://git.kernel.org/tip/0ba332f70a555548430ef3cf459b5240df0ffbd5 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 16 Mar 2015 17:41:52 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 16 Mar 2015 17:41:52 -0300 perf hists browser: Simplify symbol annotation menu setup No need to repeat some tests, skip annotation instead. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-6h6igrb81u4e6rwfmx7dv47n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 49eddeb..f69371b 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1612,19 +1612,22 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, if (!sort__has_sym) goto add_exit_option; + if (browser->selection == NULL) + goto skip_annotation; + if (sort__mode == SORT_MODE__BRANCH) { bi = browser->he_selection->branch_info; - if (browser->selection != NULL && - bi && - bi->from.sym != NULL && + + if (bi == NULL) + goto skip_annotation; + + if (bi->from.sym != NULL && !bi->from.map->dso->annotate_warned && asprintf(&options[nr_options], "Annotate %s", bi->from.sym->name) > 0) annotate_f = nr_options++; - if (browser->selection != NULL && - bi && - bi->to.sym != NULL && + if (bi->to.sym != NULL && !bi->to.map->dso->annotate_warned && (bi->to.sym != bi->from.sym || bi->to.map->dso != bi->from.map->dso) && @@ -1632,8 +1635,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, bi->to.sym->name) > 0) annotate_t = nr_options++; } else { - if (browser->selection != NULL && - browser->selection->sym != NULL && + if (browser->selection->sym != NULL && !browser->selection->map->dso->annotate_warned) { struct annotation *notes; @@ -1645,7 +1647,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events, annotate = nr_options++; } } - +skip_annotation: if (thread != NULL && asprintf(&options[nr_options], "Zoom %s %s(%d) thread", (browser->hists->thread_filter ? "out of" : "into"),