Commit cac31418 authored May 17, 2021 by James Clark Committed by Arnaldo Carvalho de Melo May 17, 2021

perf cs-etm: Move synth_opts initialisation



Move initialisation of synth_opts earlier in the function
so that synth_opts can be used at an earlier stage in a
later commit.

Signed-off-by: James Clark <james.clark@arm.com>
Reviewed-by: Leo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Al Grant <al.grant@arm.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Branislav Rankov <branislav.rankov@arm.com>
Cc: Denis Nikitin <denik@chromium.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20210517131741.3027-2-james.clark@arm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e119083b

tools/perf/util/cs-etm.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -2819,6 +2819,14 @@ int cs_etm__process_auxtrace_info(union perf_event *event,
		if (err)
		goto err_free_etm;

		if (session->itrace_synth_opts->set) {
		etm->synth_opts = *session->itrace_synth_opts;
		} else {
		itrace_synth_opts__set_default(&etm->synth_opts,
		session->itrace_synth_opts->default_no_sample);
		etm->synth_opts.callchain = false;
		}

		etm->session = session;
		etm->machine = &session->machines.host;

		@@ -2863,14 +2871,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event,
		return 0;
		}

		if (session->itrace_synth_opts->set) {
		etm->synth_opts = *session->itrace_synth_opts;
		} else {
		itrace_synth_opts__set_default(&etm->synth_opts,
		session->itrace_synth_opts->default_no_sample);
		etm->synth_opts.callchain = false;
		}

		err = cs_etm__synth_events(etm, session);
		if (err)
		goto err_delete_thread;