diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-23 10:25:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-23 10:25:57 +0200 |
| commit | 80fcd45ee05b4ef05e61d37a5ffb70a67095a9f6 (patch) | |
| tree | eee276fd27aeae2e92e2aff91cb4a3af87a792fa /tools/perf/builtin-record.c | |
| parent | 4ba792e303e278052bb0ee60cce15d6d7dc15c7c (diff) | |
| parent | f06cff7c59b6b252d667435d7baad48687b41002 (diff) | |
| download | talos-op-linux-80fcd45ee05b4ef05e61d37a5ffb70a67095a9f6.tar.gz talos-op-linux-80fcd45ee05b4ef05e61d37a5ffb70a67095a9f6.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- The default for callchains is back to 'callee' when --children is not used.
(Namhyung Kim)
- Move the 'use_offset' option to the right place where the annotate code
expects it to be to be able to properly handle it. (Namhyung Kim)
- Don't die when an unknown 'annotate' option is found in the perf config
file (usually ~/.perfconfig), just warn the user. (Arnaldo Carvalho de Melo)
Infrastructure changes:
- Support %ps/%pS in libtraceevent. (Scott Wood)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-record.c')
| -rw-r--r-- | tools/perf/builtin-record.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 24ace2f318c1..2740d7a82ae8 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1010,13 +1010,8 @@ static struct record record = { }, }; -#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace) recording: " - -#ifdef HAVE_DWARF_UNWIND_SUPPORT -const char record_callchain_help[] = CALLCHAIN_HELP "fp dwarf lbr"; -#else -const char record_callchain_help[] = CALLCHAIN_HELP "fp lbr"; -#endif +const char record_callchain_help[] = CALLCHAIN_RECORD_HELP + "\n\t\t\t\tDefault: fp"; /* * XXX Will stay a global variable till we fix builtin-script.c to stop messing @@ -1064,7 +1059,7 @@ struct option __record_options[] = { NULL, "enables call-graph recording" , &record_callchain_opt), OPT_CALLBACK(0, "call-graph", &record.opts, - "mode[,dump_size]", record_callchain_help, + "record_mode[,record_size]", record_callchain_help, &record_parse_callchain_opt), OPT_INCR('v', "verbose", &verbose, "be more verbose (show counter open errors, etc)"), |
