Commit ab236921 authored by Alexandre Truong's avatar Alexandre Truong Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Use callchain_param_setup() instead of open coded equivalent 



Refactoring script__setup_sample_type() by using callchain_param_setup()
to replace the duplicate code for callchain parameter setting up.

Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarAlexandre Truong <alexandre.truong@arm.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20211217154521.80603-4-german.gomez@arm.com


Signed-off-by: default avatarGerman Gomez <german.gomez@arm.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 32bfa5bf

tools/perf/builtin-script.c

+1 −10
Original line number Diff line number Diff line
@@ -3468,16 +3468,7 @@ static void script__setup_sample_type(struct perf_script *script) 
	struct perf_session *session = script->session;

	u64 sample_type = evlist__combined_sample_type(session->evlist);



	if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain) {

		if ((sample_type & PERF_SAMPLE_REGS_USER) &&

		    (sample_type & PERF_SAMPLE_STACK_USER)) {

			callchain_param.record_mode = CALLCHAIN_DWARF;

			dwarf_callchain_users = true;

		} else if (sample_type & PERF_SAMPLE_BRANCH_STACK)

			callchain_param.record_mode = CALLCHAIN_LBR;

		else

			callchain_param.record_mode = CALLCHAIN_FP;

	}

	callchain_param_setup(sample_type);



	if (script->stitch_lbr && (callchain_param.record_mode != CALLCHAIN_LBR)) {

		pr_warning("Can't find LBR callchain. Switch off --stitch-lbr.\n"