perf tools: Add call-graph option support into .perfconfig
Adding call-graph option support into .perfconfig file, so it's now possible use call-graph option like: [top] call-graph = fp [record] call-graph = dwarf,8192 Above options ONLY setup the unwind method. To enable perf record/top to actually use it the command line option -g/-G must be specified. The --call-graph option overloads .perfconfig setup. Assuming above configuration: $ perf record -g ls - enables dwarf unwind with user stack size dump 8192 bytes $ perf top -G - enables frame pointer unwind $ perf record --call-graph=fp ls - enables frame pointer unwind $ perf top --call-graph=dwarf,4096 ls - enables dwarf unwind with user stack size dump 4096 bytes Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1391427883-13443-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
bc5290869d
commit
eb853e8032
|
@ -749,6 +749,8 @@ int record_parse_callchain_opt(const struct option *opt,
|
||||||
struct record_opts *opts = opt->value;
|
struct record_opts *opts = opt->value;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
opts->call_graph_enabled = !unset;
|
||||||
|
|
||||||
/* --no-call-graph */
|
/* --no-call-graph */
|
||||||
if (unset) {
|
if (unset) {
|
||||||
opts->call_graph = CALLCHAIN_NONE;
|
opts->call_graph = CALLCHAIN_NONE;
|
||||||
|
@ -769,6 +771,8 @@ int record_callchain_opt(const struct option *opt,
|
||||||
{
|
{
|
||||||
struct record_opts *opts = opt->value;
|
struct record_opts *opts = opt->value;
|
||||||
|
|
||||||
|
opts->call_graph_enabled = !unset;
|
||||||
|
|
||||||
if (opts->call_graph == CALLCHAIN_NONE)
|
if (opts->call_graph == CALLCHAIN_NONE)
|
||||||
opts->call_graph = CALLCHAIN_FP;
|
opts->call_graph = CALLCHAIN_FP;
|
||||||
|
|
||||||
|
@ -776,6 +780,16 @@ int record_callchain_opt(const struct option *opt,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int perf_record_config(const char *var, const char *value, void *cb)
|
||||||
|
{
|
||||||
|
struct record *rec = cb;
|
||||||
|
|
||||||
|
if (!strcmp(var, "record.call-graph"))
|
||||||
|
return record_parse_callchain(value, &rec->opts);
|
||||||
|
|
||||||
|
return perf_default_config(var, value, cb);
|
||||||
|
}
|
||||||
|
|
||||||
static const char * const record_usage[] = {
|
static const char * const record_usage[] = {
|
||||||
"perf record [<options>] [<command>]",
|
"perf record [<options>] [<command>]",
|
||||||
"perf record [<options>] -- <command> [<options>]",
|
"perf record [<options>] -- <command> [<options>]",
|
||||||
|
@ -907,6 +921,8 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
if (rec->evlist == NULL)
|
if (rec->evlist == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
perf_config(perf_record_config, rec);
|
||||||
|
|
||||||
argc = parse_options(argc, argv, record_options, record_usage,
|
argc = parse_options(argc, argv, record_options, record_usage,
|
||||||
PARSE_OPT_STOP_AT_NON_OPTION);
|
PARSE_OPT_STOP_AT_NON_OPTION);
|
||||||
if (!argc && target__none(&rec->opts.target))
|
if (!argc && target__none(&rec->opts.target))
|
||||||
|
|
|
@ -991,6 +991,16 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
|
||||||
return record_parse_callchain_opt(opt, arg, unset);
|
return record_parse_callchain_opt(opt, arg, unset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int perf_top_config(const char *var, const char *value, void *cb)
|
||||||
|
{
|
||||||
|
struct perf_top *top = cb;
|
||||||
|
|
||||||
|
if (!strcmp(var, "top.call-graph"))
|
||||||
|
return record_parse_callchain(value, &top->record_opts);
|
||||||
|
|
||||||
|
return perf_default_config(var, value, cb);
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
parse_percent_limit(const struct option *opt, const char *arg,
|
parse_percent_limit(const struct option *opt, const char *arg,
|
||||||
int unset __maybe_unused)
|
int unset __maybe_unused)
|
||||||
|
@ -1115,6 +1125,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||||
if (top.evlist == NULL)
|
if (top.evlist == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
perf_config(perf_top_config, &top);
|
||||||
|
|
||||||
argc = parse_options(argc, argv, options, top_usage, 0);
|
argc = parse_options(argc, argv, options, top_usage, 0);
|
||||||
if (argc)
|
if (argc)
|
||||||
usage_with_options(top_usage, options);
|
usage_with_options(top_usage, options);
|
||||||
|
|
|
@ -257,6 +257,7 @@ enum perf_call_graph_mode {
|
||||||
struct record_opts {
|
struct record_opts {
|
||||||
struct target target;
|
struct target target;
|
||||||
int call_graph;
|
int call_graph;
|
||||||
|
bool call_graph_enabled;
|
||||||
bool group;
|
bool group;
|
||||||
bool inherit_stat;
|
bool inherit_stat;
|
||||||
bool no_buffering;
|
bool no_buffering;
|
||||||
|
|
|
@ -595,7 +595,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)
|
||||||
attr->mmap_data = track;
|
attr->mmap_data = track;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts->call_graph) {
|
if (opts->call_graph_enabled) {
|
||||||
perf_evsel__set_sample_bit(evsel, CALLCHAIN);
|
perf_evsel__set_sample_bit(evsel, CALLCHAIN);
|
||||||
|
|
||||||
if (opts->call_graph == CALLCHAIN_DWARF) {
|
if (opts->call_graph == CALLCHAIN_DWARF) {
|
||||||
|
|
Loading…
Reference in a new issue