From: tip-bot for Arnaldo Carvalho de Melo <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, eranian@google.com,
paulus@samba.org, acme@redhat.com, hpa@zytor.com,
mingo@kernel.org, andi@firstfloor.org, a.p.zijlstra@chello.nl,
namhyung@kernel.org, jolsa@redhat.com, dsahern@gmail.com,
tglx@linutronix.de
Subject: [tip:perf/core] perf hists browser: Use sort__has_sym
Date: Fri, 31 May 2013 04:28:03 -0700 [thread overview]
Message-ID: <tip-9c796ec8dbc8dbfe41ce35a1ccb1b59b47148daf@git.kernel.org> (raw)
In-Reply-To: <1365125198-8334-9-git-send-email-namhyung@kernel.org>
Commit-ID: 9c796ec8dbc8dbfe41ce35a1ccb1b59b47148daf
Gitweb: http://git.kernel.org/tip/9c796ec8dbc8dbfe41ce35a1ccb1b59b47148daf
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Fri, 26 Apr 2013 14:28:46 -0300
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 28 May 2013 16:23:56 +0300
perf hists browser: Use sort__has_sym
The TUI hist browser had a similar variable has_symbols for the same
purpose. Let's get rid of the duplication.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1365125198-8334-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/hists.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cad8e37..a4268ca 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -25,7 +25,6 @@ struct hist_browser {
struct map_symbol *selection;
int print_seq;
bool show_dso;
- bool has_symbols;
};
extern void hist_browser__init_hpp(void);
@@ -1155,10 +1154,6 @@ static struct hist_browser *hist_browser__new(struct hists *hists)
browser->b.refresh = hist_browser__refresh;
browser->b.seek = ui_browser__hists_seek;
browser->b.use_navkeypressed = true;
- if (sort__mode == SORT_MODE__BRANCH)
- browser->has_symbols = sort_sym_from.list.next != NULL;
- else
- browser->has_symbols = sort_sym.list.next != NULL;
}
return browser;
@@ -1386,7 +1381,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
*/
goto out_free_stack;
case 'a':
- if (!browser->has_symbols) {
+ if (!sort__has_sym) {
ui_browser__warning(&browser->b, delay_secs * 2,
"Annotation is only available for symbolic views, "
"include \"sym*\" in --sort to use it.");
@@ -1485,7 +1480,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
continue;
}
- if (!browser->has_symbols)
+ if (!sort__has_sym)
goto add_exit_option;
if (sort__mode == SORT_MODE__BRANCH) {
prev parent reply other threads:[~2013-05-31 11:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 1:26 [PATCHSET 0/8] perf tools: Cleanup for sort keys (v3) Namhyung Kim
2013-04-05 1:26 ` [PATCH 1/8] perf sort: Reorder HISTC_SRCLINE index Namhyung Kim
2013-05-31 11:24 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-04-05 1:26 ` [PATCH 2/8] perf sort: Add 'addr' sort key Namhyung Kim
2013-04-05 1:26 ` [PATCH 3/8] perf sort: Add 'addr_to/from' " Namhyung Kim
2013-04-05 1:26 ` [PATCH 4/8] perf sort: Update documentation for sort keys Namhyung Kim
2013-04-05 1:26 ` [PATCH 5/8] perf hists: Move column length setting code Namhyung Kim
2013-04-05 1:26 ` [PATCH 6/8] perf sort: Cleanup sort__has_sym setting Namhyung Kim
2013-05-31 11:25 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-04-05 1:26 ` [PATCH 7/8] perf top: Use sort__has_sym Namhyung Kim
2013-05-31 11:26 ` [tip:perf/core] " tip-bot for Namhyung Kim
2013-04-05 1:26 ` [PATCH 8/8] perf hist browser: " Namhyung Kim
2013-05-31 11:28 ` tip-bot for Arnaldo Carvalho de Melo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-9c796ec8dbc8dbfe41ce35a1ccb1b59b47148daf@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=andi@firstfloor.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox