From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@kernel.org>,
Milian Wolff <milian.wolff@kdab.com>,
Namhyung Kim <namhyung@kernel.org>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 08/14] perf top: Use callchain_param.enabled instead of symbol_conf.use_callchain
Date: Tue, 19 Apr 2016 12:50:35 -0300 [thread overview]
Message-ID: <1461081041-10580-9-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1461081041-10580-1-git-send-email-acme@kernel.org>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
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.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-top.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index f0cfdf394fac..c130a11d3a0d 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -917,15 +917,15 @@ out_err:
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 (symbol_conf.use_callchain) {
+ if (callchain->enabled) {
ui__error("Selected -g but \"sym\" not present in --sort/-s.");
return -EINVAL;
}
- } else if (callchain_param.mode != CHAIN_NONE) {
- if (callchain_register_param(&callchain_param) < 0) {
+ } else if (callchain->mode != CHAIN_NONE) {
+ if (callchain_register_param(callchain) < 0) {
ui__error("Can't register callchain params.\n");
return -EINVAL;
}
@@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top)
goto out_delete;
}
- ret = perf_top__setup_sample_type(top);
+ ret = callchain_param__setup_sample_type(&callchain_param);
if (ret)
goto out_delete;
@@ -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);
- if (!symbol_conf.use_callchain) {
+ if (!callchain_param.enabled) {
symbol_conf.cumulate_callchain = false;
perf_hpp__cancel_cumulate();
}
--
2.5.5
next prev parent reply other threads:[~2016-04-19 15:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 15:50 [GIT PULL 00/14] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 01/14] perf trace: Fix build when DWARF unwind isn't available Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 02/14] perf evsel: Add missign class prefix to has_branch_stack method Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 03/14] perf script: Check sample->callchain before using it Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 04/14] perf callchain: Set callchain_param.enabled when parsing --call-graph Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 05/14] perf report: Use callchain_param.enabled instead of tool specific knob Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 06/14] perf tools: Ditch record_opts.callgraph_set Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 07/14] perf hists browser: Fold two consecutive symbol_conf.use_callchain ifs Arnaldo Carvalho de Melo
2016-04-19 15:50 ` Arnaldo Carvalho de Melo [this message]
2016-04-19 15:50 ` [PATCH 09/14] perf script: Fix postgresql ubuntu install instructions Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 10/14] perf jit: memset() variable 'st' using the correct size Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 11/14] perf build: Remove x86 references from arch-neutral Build Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 12/14] perf symbols: Allow loading kallsyms without considering kcore files Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 13/14] perf test: Ignore kcore files in the "vmlinux matches kallsyms" test Arnaldo Carvalho de Melo
2016-04-19 15:50 ` [PATCH 14/14] perf test: Add missing verbose output explaining the reason for failure Arnaldo Carvalho de Melo
2016-04-19 19:00 ` [GIT PULL 00/14] perf/core improvements and fixes Ingo Molnar
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=1461081041-10580-9-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=milian.wolff@kdab.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=wangnan0@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).