提交 8f0f684b 编写于 作者: N Namhyung Kim 提交者: Arnaldo Carvalho de Melo

perf top: Use sort__has_sym

perf top had a similar variable sort_has_symbols for the same purpose.
Signed-off-by: NNamhyung 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-8-git-send-email-namhyung@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 930477bd
...@@ -794,7 +794,7 @@ static void perf_event__process_sample(struct perf_tool *tool, ...@@ -794,7 +794,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
return; return;
} }
if (top->sort_has_symbols) if (sort__has_sym)
perf_top__record_precise_ip(top, he, evsel->idx, ip); perf_top__record_precise_ip(top, he, evsel->idx, ip);
} }
...@@ -912,9 +912,9 @@ static int perf_top__start_counters(struct perf_top *top) ...@@ -912,9 +912,9 @@ static int perf_top__start_counters(struct perf_top *top)
return -1; return -1;
} }
static int perf_top__setup_sample_type(struct perf_top *top) static int perf_top__setup_sample_type(struct perf_top *top __maybe_unused)
{ {
if (!top->sort_has_symbols) { if (!sort__has_sym) {
if (symbol_conf.use_callchain) { if (symbol_conf.use_callchain) {
ui__error("Selected -g but \"sym\" not present in --sort/-s."); ui__error("Selected -g but \"sym\" not present in --sort/-s.");
return -EINVAL; return -EINVAL;
...@@ -1202,12 +1202,6 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -1202,12 +1202,6 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
sort__setup_elide(stdout); sort__setup_elide(stdout);
/*
* Avoid annotation data structures overhead when symbols aren't on the
* sort list.
*/
top.sort_has_symbols = sort_sym.list.next != NULL;
get_term_dimensions(&top.winsize); get_term_dimensions(&top.winsize);
if (top.print_entries == 0) { if (top.print_entries == 0) {
struct sigaction act = { struct sigaction act = {
......
...@@ -26,7 +26,6 @@ struct perf_top { ...@@ -26,7 +26,6 @@ struct perf_top {
int print_entries, count_filter, delay_secs; int print_entries, count_filter, delay_secs;
bool hide_kernel_symbols, hide_user_symbols, zero; bool hide_kernel_symbols, hide_user_symbols, zero;
bool use_tui, use_stdio; bool use_tui, use_stdio;
bool sort_has_symbols;
bool kptr_restrict_warned; bool kptr_restrict_warned;
bool vmlinux_warned; bool vmlinux_warned;
bool dump_symtab; bool dump_symtab;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册