aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorRabin Vincent <rabinv@axis.com>2016-08-10 09:52:28 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-11-07 20:13:47 -0500
commitc56cb33b56c13493eeb95612f80e4dd6e35cd109 (patch)
treed5dcf7b02554d1b20b0f9328c417ecec15aba001 /tools/perf
parent91a79e5fa696fa626bfbd47f827eaf3eb7d76dc5 (diff)
perf callchain: Fixup help/config for no-unwinding
Since 841e3558b2d ("perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support"), --call-graph dwarf is allowed in 'perf record' even without unwind support. A couple of other places don't reflect this yet though: the help text should list dwarf as a valid record mode and the dump_size config should be respected too. Signed-off-by: Rabin Vincent <rabinv@axis.com> Cc: He Kuang <hekuang@huawei.com> Fixes: 841e3558b2de ("perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support") Link: http://lkml.kernel.org/r/1470837148-7642-1-git-send-email-rabin.vincent@axis.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/callchain.c2
-rw-r--r--tools/perf/util/callchain.h4
2 files changed, 0 insertions, 6 deletions
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 07fd30bc2f81..ae58b493af45 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -193,7 +193,6 @@ int perf_callchain_config(const char *var, const char *value)
193 193
194 if (!strcmp(var, "record-mode")) 194 if (!strcmp(var, "record-mode"))
195 return parse_callchain_record_opt(value, &callchain_param); 195 return parse_callchain_record_opt(value, &callchain_param);
196#ifdef HAVE_DWARF_UNWIND_SUPPORT
197 if (!strcmp(var, "dump-size")) { 196 if (!strcmp(var, "dump-size")) {
198 unsigned long size = 0; 197 unsigned long size = 0;
199 int ret; 198 int ret;
@@ -203,7 +202,6 @@ int perf_callchain_config(const char *var, const char *value)
203 202
204 return ret; 203 return ret;
205 } 204 }
206#endif
207 if (!strcmp(var, "print-type")) 205 if (!strcmp(var, "print-type"))
208 return parse_callchain_mode(value); 206 return parse_callchain_mode(value);
209 if (!strcmp(var, "order")) 207 if (!strcmp(var, "order"))
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 13e75549c440..47cfd1080975 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -11,11 +11,7 @@
11 11
12#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n" 12#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n"
13 13
14#ifdef HAVE_DWARF_UNWIND_SUPPORT
15# define RECORD_MODE_HELP HELP_PAD "record_mode:\tcall graph recording mode (fp|dwarf|lbr)\n" 14# define RECORD_MODE_HELP HELP_PAD "record_mode:\tcall graph recording mode (fp|dwarf|lbr)\n"
16#else
17# define RECORD_MODE_HELP HELP_PAD "record_mode:\tcall graph recording mode (fp|lbr)\n"
18#endif
19 15
20#define RECORD_SIZE_HELP \ 16#define RECORD_SIZE_HELP \
21 HELP_PAD "record_size:\tif record_mode is 'dwarf', max size of stack recording (<bytes>)\n" \ 17 HELP_PAD "record_size:\tif record_mode is 'dwarf', max size of stack recording (<bytes>)\n" \