perf trace: Only auto set call-graph to "dwarf" when syscalls are being traced

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 20, 2016 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-05-20 17:46 UTC #0 lore raw

Commit-ID:  caa36ed7ba82caa9f685dd04aa10d0bf87ea8b6a
Gitweb:     http://git.kernel.org/tip/caa36ed7ba82caa9f685dd04aa10d0bf87ea8b6a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 19 May 2016 19:00:27 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 20 May 2016 11:43:57 -0300

perf trace: Only auto set call-graph to "dwarf" when syscalls are being traced

When --min-stack or --max-stack is passwd but --no-syscalls is also in effect, there is no point in automatically setting '--call-graph dwarf'.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Milian Wolff <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/perf/builtin-trace.c +1 -1

index 7401de7..487c104 100644
@@ -2910,7 +2910,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
 	}
 
 #ifdef HAVE_DWARF_UNWIND_SUPPORT
-	if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled)
+	if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled && trace.trace_syscalls)
 		record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false);
 #endif