perf top: Use callchain_param.enabled instead of symbol_conf.use_callchain

One more step in the direction of using just callchain_param for
callchain parameters.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-3b1o9kb2dc94zldz0klckti6@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1b6b678e
...@@ -917,15 +917,15 @@ static int perf_top__start_counters(struct perf_top *top) ...@@ -917,15 +917,15 @@ 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 __maybe_unused) static int callchain_param__setup_sample_type(struct callchain_param *callchain)
{ {
if (!sort__has_sym) { if (!sort__has_sym) {
if (symbol_conf.use_callchain) { if (callchain->enabled) {
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;
} }
} else if (callchain_param.mode != CHAIN_NONE) { } else if (callchain->mode != CHAIN_NONE) {
if (callchain_register_param(&callchain_param) < 0) { if (callchain_register_param(callchain) < 0) {
ui__error("Can't register callchain params.\n"); ui__error("Can't register callchain params.\n");
return -EINVAL; return -EINVAL;
} }
...@@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top) ...@@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top)
goto out_delete; goto out_delete;
} }
ret = perf_top__setup_sample_type(top); ret = callchain_param__setup_sample_type(&callchain_param);
if (ret) if (ret)
goto out_delete; goto out_delete;
...@@ -1311,7 +1311,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -1311,7 +1311,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
top.sym_evsel = perf_evlist__first(top.evlist); top.sym_evsel = perf_evlist__first(top.evlist);
if (!symbol_conf.use_callchain) { if (!callchain_param.enabled) {
symbol_conf.cumulate_callchain = false; symbol_conf.cumulate_callchain = false;
perf_hpp__cancel_cumulate(); perf_hpp__cancel_cumulate();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment