From nobody Wed Dec 17 10:46:17 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE18317A92F for ; Fri, 12 Jul 2024 18:12:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720807953; cv=none; b=t3t4q4qC9irnE8KcSPx97H/7naHBrgDX2TbujjpO2ty0ANgFg1ZvjxVjWioCctcB9M6IA7rJCG3hgg0yVbrqml07dnCT12sUUUUcRbUhVdmQtqn++vXcxM7Vf9f+o5siMgB49Lrg2uRLX2pMiM1YvzhFJwW9NL0wA3HAMjARxBw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720807953; c=relaxed/simple; bh=LWeT84SQaD/ZqxsdujULbunWNxfNaZERjhKf3ganreg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=BQYN7c4TDQilzL6WXH/EbqtDab9rnpFwctUFC70+p/TEh8G84D4BJV32nHw11tbFYIkK8SY8ecUTfAoABm9fg280GRTYWhc18mktkhZocM0aoC7ji+NoX+NFaaGb/2w8EPmmiWlA+WK3CoVh3KCYH+UNSSg92Iv2MN+wcpkHx6M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3wbr92Zo; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3wbr92Zo" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-64f4b849b7cso37285717b3.2 for ; Fri, 12 Jul 2024 11:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720807950; x=1721412750; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=jf/366lvU4AUPtbGBpn9zhF7c/C+EcohgCe44YuCQ7Y=; b=3wbr92ZoWcB9ueDv6oKidA3jdtZEPVFK+TxOSUOUL0E71QA+F0oI0J0NzZBxzXxbYp qNphE0IhHEHk2VZSvwLKvYuCTRqLB2VwG/UbuV4u2hYQ8pNQHY14CoygDk/W2bg3L5AS E07A1BHRqTpUPQCV9Tt4Okr+K+dotW9qLp+crlhmjulCaG69xJ1HJqUa1uI24eVbTMza xc1xZjtUn438kqAgKqoiosVxOOtszkCDy3Mr3t3n/VLh3XbHLseYtJD+aC0/nqAMS+iQ cowkGKmM2BPqpsDEhHlyrVfEaFiUEvxalH3P4IEwERaxvh0Kh7rXyrYQ2M7Pos1Dd/k6 UJ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720807950; x=1721412750; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=jf/366lvU4AUPtbGBpn9zhF7c/C+EcohgCe44YuCQ7Y=; b=JHQ31ud4LvKZVcMqBRKtljAltcokg1M9MxhRWVJqah3H5Zw2M2Ww7gxa8is96ZvQTl yPOw4A7S+i1EEi73SETR2QbBH1/8Wb0DmCt8i4A+YMQYvL84ED2LdO/w1RHxVnZmiJem ep5cVc8IisK3RIBvonz9SYEWPUn4MUeK7y+68J9LIL8ETvR7y+gpZ04D7+Ynlt0d0ZAe Bba7BryYWlN1NNpHa9FtdJXNoAzmdqPhK43Bgh7mjAtjA2u8ou/KJSjttoQO8Bk2qOsW gEV7SQkWKAzcZ+gigrtuR7jNkjGh34ur9hNrjkCz3mFJWmoy3slaWudRKWL/CXj45Tuo 2D7g== X-Forwarded-Encrypted: i=1; AJvYcCXVwAf5pZ4IgvpsuMW8hTNZXz9+uVDwKpHt3pdup+PDiac/5GT2CMDHDUfHTNhwY93XrOCRn/2qQShiuOvlD5suoyfYez/rZZrISaLQ X-Gm-Message-State: AOJu0YzXYYYd0kJe9bk+G4rfi8diQxzhleXeL2nVIkZnhksruFwPeZEj fA6XbPPE2MPbpTvaFUTMRgjw1yOI5x9uAt/cMTFpcK+zToBY+lLCpM0SaHhmIrGyF+q1qo0N2hF atdRZsg== X-Google-Smtp-Source: AGHT+IFlsKuGpxVNyWoLObgwAYJDkigpd5ozGArlXoag4yrjnwDea6v3GSNUcs145Zpeoo6bG+3lCKfvRy4y X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:2e7d:d47a:a0c6:e3b1]) (user=irogers job=sendgmr) by 2002:a05:690c:25c5:b0:62a:4932:68de with SMTP id 00721157ae682-658f06db413mr2068187b3.8.1720807950582; Fri, 12 Jul 2024 11:12:30 -0700 (PDT) Date: Fri, 12 Jul 2024 11:10:50 -0700 In-Reply-To: <20240712181108.475336-1-irogers@google.com> Message-Id: <20240712181108.475336-10-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240712181108.475336-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Subject: [PATCH v5 09/27] perf lock: Use perf_tool__init From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Athira Rajeev , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- tools/perf/builtin-lock.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 6efa9d646637..2c216427e929 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1933,22 +1933,21 @@ static bool force; static int __cmd_report(bool display_info) { int err =3D -EINVAL; - struct perf_tool eops =3D { - .attr =3D perf_event__process_attr, - .event_update =3D process_event_update, - .sample =3D process_sample_event, - .comm =3D perf_event__process_comm, - .mmap =3D perf_event__process_mmap, - .namespaces =3D perf_event__process_namespaces, - .tracing_data =3D perf_event__process_tracing_data, - .ordered_events =3D true, - }; + struct perf_tool eops; struct perf_data data =3D { .path =3D input_name, .mode =3D PERF_DATA_MODE_READ, .force =3D force, }; =20 + perf_tool__init(&eops, /*ordered_events=3D*/true); + eops.attr =3D perf_event__process_attr; + eops.event_update =3D process_event_update; + eops.sample =3D process_sample_event; + eops.comm =3D perf_event__process_comm; + eops.mmap =3D perf_event__process_mmap; + eops.namespaces =3D perf_event__process_namespaces; + eops.tracing_data =3D perf_event__process_tracing_data; session =3D 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 struc= t option *options, static int __cmd_contention(int argc, const char **argv) { int err =3D -EINVAL; - struct perf_tool eops =3D { - .attr =3D perf_event__process_attr, - .event_update =3D process_event_update, - .sample =3D process_sample_event, - .comm =3D perf_event__process_comm, - .mmap =3D perf_event__process_mmap, - .tracing_data =3D perf_event__process_tracing_data, - .ordered_events =3D true, - }; + struct perf_tool eops; struct perf_data data =3D { .path =3D input_name, .mode =3D PERF_DATA_MODE_READ, @@ -2100,6 +2091,14 @@ static int __cmd_contention(int argc, const char **a= rgv) =20 con.result =3D &lockhash_table[0]; =20 + perf_tool__init(&eops, /*ordered_events=3D*/true); + eops.attr =3D perf_event__process_attr; + eops.event_update =3D process_event_update; + eops.sample =3D process_sample_event; + eops.comm =3D perf_event__process_comm; + eops.mmap =3D perf_event__process_mmap; + eops.tracing_data =3D perf_event__process_tracing_data; + session =3D perf_session__new(use_bpf ? NULL : &data, &eops); if (IS_ERR(session)) { pr_err("Initializing perf session failed\n"); --=20 2.45.2.993.g49e7a77208-goog