perf lock: 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: Ian 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-10-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
a01a5ef988
commit
b4fd4d00f9
+18
-19
@@ -1933,22 +1933,21 @@ static bool force;
|
||||
static int __cmd_report(bool display_info)
|
||||
{
|
||||
int err = -EINVAL;
|
||||
struct perf_tool eops = {
|
||||
.attr = perf_event__process_attr,
|
||||
.event_update = process_event_update,
|
||||
.sample = process_sample_event,
|
||||
.comm = perf_event__process_comm,
|
||||
.mmap = perf_event__process_mmap,
|
||||
.namespaces = perf_event__process_namespaces,
|
||||
.tracing_data = perf_event__process_tracing_data,
|
||||
.ordered_events = true,
|
||||
};
|
||||
struct perf_tool eops;
|
||||
struct perf_data data = {
|
||||
.path = input_name,
|
||||
.mode = PERF_DATA_MODE_READ,
|
||||
.force = force,
|
||||
};
|
||||
|
||||
perf_tool__init(&eops, /*ordered_events=*/true);
|
||||
eops.attr = perf_event__process_attr;
|
||||
eops.event_update = process_event_update;
|
||||
eops.sample = process_sample_event;
|
||||
eops.comm = perf_event__process_comm;
|
||||
eops.mmap = perf_event__process_mmap;
|
||||
eops.namespaces = perf_event__process_namespaces;
|
||||
eops.tracing_data = perf_event__process_tracing_data;
|
||||
session = perf_session__new(&data, &eops);
|
||||
if (IS_ERR(session)) {
|
||||
pr_err("Initializing perf session failed\n");
|
||||
@@ -2069,15 +2068,7 @@ static int check_lock_contention_options(const struct option *options,
|
||||
static int __cmd_contention(int argc, const char **argv)
|
||||
{
|
||||
int err = -EINVAL;
|
||||
struct perf_tool eops = {
|
||||
.attr = perf_event__process_attr,
|
||||
.event_update = process_event_update,
|
||||
.sample = process_sample_event,
|
||||
.comm = perf_event__process_comm,
|
||||
.mmap = perf_event__process_mmap,
|
||||
.tracing_data = perf_event__process_tracing_data,
|
||||
.ordered_events = true,
|
||||
};
|
||||
struct perf_tool eops;
|
||||
struct perf_data data = {
|
||||
.path = input_name,
|
||||
.mode = PERF_DATA_MODE_READ,
|
||||
@@ -2100,6 +2091,14 @@ static int __cmd_contention(int argc, const char **argv)
|
||||
|
||||
con.result = &lockhash_table[0];
|
||||
|
||||
perf_tool__init(&eops, /*ordered_events=*/true);
|
||||
eops.attr = perf_event__process_attr;
|
||||
eops.event_update = process_event_update;
|
||||
eops.sample = process_sample_event;
|
||||
eops.comm = perf_event__process_comm;
|
||||
eops.mmap = perf_event__process_mmap;
|
||||
eops.tracing_data = perf_event__process_tracing_data;
|
||||
|
||||
session = perf_session__new(use_bpf ? NULL : &data, &eops);
|
||||
if (IS_ERR(session)) {
|
||||
pr_err("Initializing perf session failed\n");
|
||||
|
||||
Reference in New Issue
Block a user