Commit 4a20562b authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf mem: Use perf_tool__init() 



Use perf_tool__init() so that more uses of 'struct perf_tool' can be const
and not relying on perf_tool__fill_defaults().

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Sun Haiyong <sunhaiyong@loongson.cn>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Yicong Yang <yangyicong@hisilicon.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20240812204720.631678-20-irogers@google.com


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

tools/perf/builtin-mem.c

+17 −16
Original line number Diff line number Diff line
@@ -276,7 +276,23 @@ static int report_raw_events(struct perf_mem *mem) 
		.force = mem->force,

	};

	int ret;

	struct perf_session *session = perf_session__new(&data, &mem->tool);

	struct perf_session *session;



	perf_tool__init(&mem->tool, /*ordered_events=*/true);

	mem->tool.sample		= process_sample_event;

	mem->tool.mmap		= perf_event__process_mmap;

	mem->tool.mmap2		= perf_event__process_mmap2;

	mem->tool.comm		= perf_event__process_comm;

	mem->tool.lost		= perf_event__process_lost;

	mem->tool.fork		= perf_event__process_fork;

	mem->tool.attr		= perf_event__process_attr;

	mem->tool.build_id	= perf_event__process_build_id;

	mem->tool.namespaces	= perf_event__process_namespaces;

	mem->tool.auxtrace_info  = perf_event__process_auxtrace_info;

	mem->tool.auxtrace       = perf_event__process_auxtrace;

	mem->tool.auxtrace_error = perf_event__process_auxtrace_error;



	session = perf_session__new(&data, &mem->tool);



	if (IS_ERR(session))

		return PTR_ERR(session);
@@ -458,21 +474,6 @@ int cmd_mem(int argc, const char **argv) 
{

	struct stat st;

	struct perf_mem mem = {

		.tool = {

			.sample		= process_sample_event,

			.mmap		= perf_event__process_mmap,

			.mmap2		= perf_event__process_mmap2,

			.comm		= perf_event__process_comm,

			.lost		= perf_event__process_lost,

			.fork		= perf_event__process_fork,

			.attr		= perf_event__process_attr,

			.build_id	= perf_event__process_build_id,

			.namespaces	= perf_event__process_namespaces,

			.auxtrace_info  = perf_event__process_auxtrace_info,

			.auxtrace       = perf_event__process_auxtrace,

			.auxtrace_error = perf_event__process_auxtrace_error,

			.ordered_events	= true,

		},

		.input_name		 = "perf.data",

		/*

		 * default to both load an store sampling