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

perf data convert json: 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-23-irogers@google.com


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

tools/perf/util/data-convert-json.c

+20 −23
Original line number Diff line number Diff line
@@ -316,39 +316,36 @@ int bt_convert__perf2json(const char *input_name, const char *output_name, 
	struct perf_session *session;

	int fd;

	int ret = -1;



	struct convert_json c = {

		.tool = {

			.sample         = process_sample_event,

			.mmap           = perf_event__process_mmap,

			.mmap2          = perf_event__process_mmap2,

			.comm           = perf_event__process_comm,

			.namespaces     = perf_event__process_namespaces,

			.cgroup         = perf_event__process_cgroup,

			.exit           = perf_event__process_exit,

			.fork           = perf_event__process_fork,

			.lost           = perf_event__process_lost,

#ifdef HAVE_LIBTRACEEVENT

			.tracing_data   = perf_event__process_tracing_data,

#endif

			.build_id       = perf_event__process_build_id,

			.id_index       = perf_event__process_id_index,

			.auxtrace_info  = perf_event__process_auxtrace_info,

			.auxtrace       = perf_event__process_auxtrace,

			.event_update   = perf_event__process_event_update,

			.ordered_events = true,

			.ordering_requires_timestamps = true,

		},

		.first = true,

		.events_count = 0,

	};



	struct perf_data data = {

		.mode = PERF_DATA_MODE_READ,

		.path = input_name,

		.force = opts->force,

	};



	perf_tool__init(&c.tool, /*ordered_events=*/true);

	c.tool.sample         = process_sample_event;

	c.tool.mmap           = perf_event__process_mmap;

	c.tool.mmap2          = perf_event__process_mmap2;

	c.tool.comm           = perf_event__process_comm;

	c.tool.namespaces     = perf_event__process_namespaces;

	c.tool.cgroup         = perf_event__process_cgroup;

	c.tool.exit           = perf_event__process_exit;

	c.tool.fork           = perf_event__process_fork;

	c.tool.lost           = perf_event__process_lost;

#ifdef HAVE_LIBTRACEEVENT

	c.tool.tracing_data   = perf_event__process_tracing_data;

#endif

	c.tool.build_id       = perf_event__process_build_id;

	c.tool.id_index       = perf_event__process_id_index;

	c.tool.auxtrace_info  = perf_event__process_auxtrace_info;

	c.tool.auxtrace       = perf_event__process_auxtrace;

	c.tool.event_update   = perf_event__process_event_update;

	c.tool.ordering_requires_timestamps = true;



	if (opts->all) {

		pr_err("--all is currently unsupported for JSON output.\n");

		goto err;