Commit 0883e820 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xay69plylwibpb3l4isrpl1k@git.kernel.org


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

tools/perf/builtin-record.c

+20 −15
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE