Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56cb33b authored by Rabin Vincent's avatar Rabin Vincent Committed by Arnaldo Carvalho de Melo
Browse files

perf callchain: Fixup help/config for no-unwinding 



Since 841e3558 ("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: default avatarRabin Vincent <rabinv@axis.com>
Cc: He Kuang <hekuang@huawei.com>
Fixes: 841e3558 ("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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 91a79e5f

tools/perf/util/callchain.c

+0 −2
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ int perf_callchain_config(const char *var, const char *value) 


	if (!strcmp(var, "record-mode"))

		return parse_callchain_record_opt(value, &callchain_param);

#ifdef HAVE_DWARF_UNWIND_SUPPORT

	if (!strcmp(var, "dump-size")) {

		unsigned long size = 0;

		int ret;
@@ -203,7 +202,6 @@ int perf_callchain_config(const char *var, const char *value) 


		return ret;

	}

#endif

	if (!strcmp(var, "print-type"))

		return parse_callchain_mode(value);

	if (!strcmp(var, "order"))

tools/perf/util/callchain.h

+0 −4
Original line number Diff line number Diff line
@@ -11,11 +11,7 @@ 


#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n"



#ifdef HAVE_DWARF_UNWIND_SUPPORT

# define RECORD_MODE_HELP  HELP_PAD "record_mode:\tcall graph recording mode (fp|dwarf|lbr)\n"

#else

# define RECORD_MODE_HELP  HELP_PAD "record_mode:\tcall graph recording mode (fp|lbr)\n"

#endif



#define RECORD_SIZE_HELP						\

	HELP_PAD "record_size:\tif record_mode is 'dwarf', max size of stack recording (<bytes>)\n" \