perf record: Export record_opts based callchain parsing helper
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 0883e820a0ac18e04f036dbebc3580351d7fd6cf Gitweb: http://git.kernel.org/tip/0883e820a0ac18e04f036dbebc3580351d7fd6cf Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 15 Apr 2016 16:37:17 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 15 Apr 2016 16:37:17 -0300
perf record: Export record_opts based callchain parsing helper
To be able to call it outside option parsing, like when setting a default --call-graph parameter in 'perf trace' when just --min-stack is used.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-record.c | 35 ++++++++++++++++++++--------------- tools/perf/util/callchain.h | 6 ++++++ 2 files changed, 26 insertions(+), 15 deletions(-)
tools/perf/builtin-record.c +20 -15
@@ -930,45 +930,50 @@ out_delete_session:return status; } -static void callchain_debug (void ) +static void callchain_debug (struct callchain_param *callchain) {static const char *str[CALLCHAIN_MAX ] = {"NONE" ,"FP" ,"DWARF" ,"LBR" }; -pr_debug ("callchain: type %s\n" , str[callchain_param.record_mode]); +pr_debug ("callchain: type %s\n" , str[callchain->record_mode]); -if (callchain_param.record_mode ==CALLCHAIN_DWARF ) +if (callchain->record_mode ==CALLCHAIN_DWARF )pr_debug ("callchain: stack dump size %d\n" , - callchain_param.dump_size); + callchain->dump_size); } -int record_parse_callchain_opt (const struct option *opt, -const char *arg, -int unset) +int record_opts__parse_callchain (struct record_opts *record, +struct callchain_param *callchain, +const char *arg,bool unset) {int ret; -struct record_opts *record = (struct record_opts *)opt->value; - record->callgraph_set = true; - callchain_param.enabled = !unset; + callchain->enabled = !unset;/* --no-call-graph */ if (unset) { - callchain_param.record_mode =CALLCHAIN_NONE ; + callchain->record_mode =CALLCHAIN_NONE ;pr_debug ("callchain: disabled\n" );return 0 ; } - ret =parse_callchain_record_opt (arg, &callchain_param); + ret =parse_callchain_record_opt (arg, callchain);if (!ret) {/* Enable data address sampling for DWARF unwind. */ -if (callchain_param.record_mode ==CALLCHAIN_DWARF ) +if (callchain->record_mode ==CALLCHAIN_DWARF ) record->sample_address = true; -callchain_debug (); +callchain_debug (callchain); }return ret; } +int record_parse_callchain_opt (const struct option *opt, +const char *arg, +int unset) +{ +return record_opts__parse_callchain (opt->value, &callchain_param, arg, unset); +} +int record_callchain_opt (const struct option *opt,const char *arg__maybe_unused ,int unset__maybe_unused )
@@ -981,7 +986,7 @@ int record_callchain_opt(const struct option *opt,if (callchain_param.record_mode ==CALLCHAIN_NONE ) callchain_param.record_mode =CALLCHAIN_FP ; -callchain_debug (); +callchain_debug (&callchain_param);return 0 ; }
tools/perf/util/callchain.h +6 -0
@@ -212,6 +212,12 @@ struct hist_entry;int record_parse_callchain_opt (const struct option *opt,const char *arg,int unset);int record_callchain_opt (const struct option *opt,const char *arg,int unset); +struct record_opts ; + +int record_opts__parse_callchain (struct record_opts *record, +struct callchain_param *callchain, +const char *arg,bool unset); + int sample__resolve_callchain(struct perf_sample *sample, struct callchain_cursor *cursor, struct symbol **parent, struct perf_evsel *evsel, struct addr_location *al,