Commit-ID:  a3a4a3b37c9b911af4c375b2475cea0fd2b84d38
Gitweb:     https://git.kernel.org/tip/a3a4a3b37c9b911af4c375b2475cea0fd2b84d38
Author:     Yisheng Xie <xieyishe...@huawei.com>
AuthorDate: Mon, 12 Mar 2018 19:25:56 +0800
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Fri, 16 Mar 2018 13:56:04 -0300

perf top: Fix top.call-graph config option reading

When trying to add the "call-graph" variable for top into the
.perfconfig file, like:

      [top]
            call-graph = fp

I that perf_top_config() do not parse this variable.

Fix it by calling perf_default_config() when the top.call-graph variable
is set.

Signed-off-by: Yisheng Xie <xieyishe...@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <a...@redhat.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Wang Nan <wangn...@huawei.com>
Fixes: b8cbb349061e ("perf config: Bring perf_default_config to the very 
beginning at main()")
Link: 
http://lkml.kernel.org/r/1520853957-36106-1-git-send-email-xieyishe...@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/builtin-top.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 0a26b56afcc5..113c298ed38b 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1223,8 +1223,10 @@ parse_callchain_opt(const struct option *opt, const char 
*arg, int unset)
 
 static int perf_top_config(const char *var, const char *value, void *cb 
__maybe_unused)
 {
-       if (!strcmp(var, "top.call-graph"))
-               var = "call-graph.record-mode"; /* fall-through */
+       if (!strcmp(var, "top.call-graph")) {
+               var = "call-graph.record-mode";
+               return perf_default_config(var, value, cb);
+       }
        if (!strcmp(var, "top.children")) {
                symbol_conf.cumulate_callchain = perf_config_bool(var, value);
                return 0;

Reply via email to