Commit 2ddd5c04 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Ditch record_opts.callgraph_set 

We have callchain_param.enabled for that.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-silwqjc2t25ls42dsvg28pp5@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1cc83815

tools/perf/builtin-record.c

+6 −8
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ int record_opts__parse_callchain(struct record_opts *record, 
				 const char *arg, bool unset)

{

	int ret;

	record->callgraph_set = true;

	callchain->enabled = !unset;



	/* --no-call-graph */
@@ -978,15 +977,14 @@ int record_callchain_opt(const struct option *opt, 
			 const char *arg __maybe_unused,

			 int unset __maybe_unused)

{

	struct record_opts *record = (struct record_opts *)opt->value;

	struct callchain_param *callchain = opt->value;



	record->callgraph_set = true;

	callchain_param.enabled = true;

	callchain->enabled = true;



	if (callchain_param.record_mode == CALLCHAIN_NONE)

		callchain_param.record_mode = CALLCHAIN_FP;

	if (callchain->record_mode == CALLCHAIN_NONE)

		callchain->record_mode = CALLCHAIN_FP;



	callchain_debug(&callchain_param);

	callchain_debug(callchain);

	return 0;

}
@@ -1224,7 +1222,7 @@ struct option __record_options[] = { 
		     record__parse_mmap_pages),

	OPT_BOOLEAN(0, "group", &record.opts.group,

		    "put the counters into a counter group"),

	OPT_CALLBACK_NOOPT('g', NULL, &record.opts,

	OPT_CALLBACK_NOOPT('g', NULL, &callchain_param,

			   NULL, "enables call-graph recording" ,

			   &record_callchain_opt),

	OPT_CALLBACK(0, "call-graph", &record.opts,

tools/perf/builtin-top.c

+6 −7
Original line number Diff line number Diff line
@@ -1045,18 +1045,17 @@ callchain_opt(const struct option *opt, const char *arg, int unset) 
static int

parse_callchain_opt(const struct option *opt, const char *arg, int unset)

{

	struct record_opts *record = (struct record_opts *)opt->value;

	struct callchain_param *callchain = opt->value;



	record->callgraph_set = true;

	callchain_param.enabled = !unset;

	callchain_param.record_mode = CALLCHAIN_FP;

	callchain->enabled = !unset;

	callchain->record_mode = CALLCHAIN_FP;



	/*

	 * --no-call-graph

	 */

	if (unset) {

		symbol_conf.use_callchain = false;

		callchain_param.record_mode = CALLCHAIN_NONE;

		callchain->record_mode = CALLCHAIN_NONE;

		return 0;

	}
@@ -1162,10 +1161,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
		   "output field(s): overhead, period, sample plus all of sort keys"),

	OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,

		    "Show a column with the number of samples"),

	OPT_CALLBACK_NOOPT('g', NULL, &top.record_opts,

	OPT_CALLBACK_NOOPT('g', NULL, &callchain_param,

			   NULL, "enables call-graph recording and display",

			   &callchain_opt),

	OPT_CALLBACK(0, "call-graph", &top.record_opts,

	OPT_CALLBACK(0, "call-graph", &callchain_param,

		     "record_mode[,record_size],print_type,threshold[,print_limit],order,sort_key[,branch]",

		     top_callchain_help, &parse_callchain_opt),

	OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain,

tools/perf/builtin-trace.c

+4 −4
Original line number Diff line number Diff line
@@ -2457,7 +2457,7 @@ static int trace__add_syscall_newtp(struct trace *trace) 
	perf_evlist__add(evlist, sys_enter);

	perf_evlist__add(evlist, sys_exit);



	if (trace->opts.callgraph_set && !trace->kernel_syscallchains) {

	if (callchain_param.enabled && !trace->kernel_syscallchains) {

		/*

		 * We're interested only in the user space callchain

		 * leading to the syscall, allow overriding that for
@@ -2546,7 +2546,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 


	perf_evlist__config(evlist, &trace->opts, NULL);



	if (trace->opts.callgraph_set && trace->syscalls.events.sys_exit) {

	if (callchain_param.enabled && trace->syscalls.events.sys_exit) {

		perf_evsel__config_callchain(trace->syscalls.events.sys_exit,

					     &trace->opts, &callchain_param);

               /*
@@ -3153,11 +3153,11 @@ 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) && !trace.opts.callgraph_set)

	if ((trace.min_stack || max_stack_user_set) && !callchain_param.enabled)

		record_opts__parse_callchain(&trace.opts, &callchain_param, "dwarf", false);

#endif



	if (trace.opts.callgraph_set) {

	if (callchain_param.enabled) {

		if (!mmap_pages_user_set && geteuid() == 0)

			trace.opts.mmap_pages = perf_event_mlock_kb_in_pages() * 4;

tools/perf/perf.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ struct record_opts { 
	bool	     sample_weight;

	bool	     sample_time;

	bool	     sample_time_set;

	bool	     callgraph_set;

	bool	     period;

	bool	     running_time;

	bool	     full_auxtrace;

CRA Git | Maintained and supported by SUSTech CRA and CCSE