From nobody Thu Dec 18 05:34:36 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 82278199EB1 for ; Mon, 12 Aug 2024 20:48:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723495682; cv=none; b=WsU9ewUJ+IHgP1x3tSWswkwj7Kq7I/4hIFKcDJ3n185Fm1lw6/eTmgwDxVjVrRP5fWhWj420WmW55iY8dVckfMd3H21NMlIkyVM29Ni7Y6JR8prLGZlyDijngmXWcERASvBAMnOKOTy+u83FcOtQjHpIuOFqdKRm4+YfpCUrS2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723495682; c=relaxed/simple; bh=yn1Y4YUPaCPNPZx3MbBPCZJQjCXbLK9zms+TrM3KBDI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=hUt2WHcj365lTsWJ1vFssHhQPgMA/gWGXYkKMz+D5e+o2lloaKDe1oGPjVUGLjebXMJBiktK6K1kadfvKXt0Tkv2C3cakXb6uhILT7Sg7zfJJhY/b9AYUQIRU5kdlI6ASxW45YNIpIE4iwkQMQdb4q0Z38hVDvwBW2DN/fcIQlI= 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=qn5XzBn5; arc=none smtp.client-ip=209.85.128.202 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="qn5XzBn5" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6688c44060fso112167857b3.2 for ; Mon, 12 Aug 2024 13:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723495679; x=1724100479; 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=7NdZMo6g09POfWB6a47CRgDZioDpzOqzlpd52Wjbvy4=; b=qn5XzBn5gGN2lHDf2XyMbYTujX/lP7fL99HrkueOrXGlWxt0rvsqgFy+MDV7mj7YeK Oi6zDeRC6f5kxtS/85EJvP7Pw6te1jFXIndLy2nfXyhfF8dUWZU78jHyg9j2/dyH//N9 Uq+k5Oz3gDxcUqVTVn8AS/6f+3qNa1CSKO1e/wy91rDehC20NJbRVHfZr3o1TAqo8bht B2X1hu9iaQYE8RR45o3QiSUzAxAiUfTJ9QzxghgyVw/VHJPmJYgGaXWiQZQRodeVJuL8 +xrIiP9BhExTouJohhlLPkpy6OD/OhUZYKhdEHbtvNSueUjK4RUpfemgWpqUX+Sj7Kq5 gG/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723495679; x=1724100479; 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=7NdZMo6g09POfWB6a47CRgDZioDpzOqzlpd52Wjbvy4=; b=kFxYdb3+aqA/nJSYpveGplxcwaGMbDrs09F6Udc/FP0xIRsHHMXsUOjVltxRSpr+Pg Kq8Y+nwQuBN7KfQ8kIPAEy/3AhlpAvlWD9vnMKtZqnzUsZR4vs9cE+QntWY9vHCse1vA Ayi0XhIRZGNOR0sC1didNcrkeAC7ZJzon+qKMDhrkC+YvUjZzSJHGIuP9pKkgu3NDMCO R+c5EgJbs7nx3AtnSicXCGt7uFvJcVorp5ZCd1aZJUnr3O0NoG4h55s7/NDSVqVcjlKW lIFpCbfO41x4JpkOkOof0/WgC5rWK0mBgxb66E1MRwuCTzo6mvM+TR070bbDK5/1D3ae tqLw== X-Forwarded-Encrypted: i=1; AJvYcCVyNVF7MJYWplY53mvkiU/UaFs+hV3aEfHZSRW+0nl/pD0lUZlK0f58c+23nhNn9tIfztRCdF0mxJzC9GYtIjekzjXj7tlaeiJNnY3p X-Gm-Message-State: AOJu0YyTo318J8w6+z6gU3V02MlPgcDIeTzZ4cQ3mJrt6/FGXlsBdgUJ pJB9FSY7QB8XQ6nwxjD570DmS7i2PVa0QRLbJAkuBjixY5rc1c5cczFNDxY844JaV42dxxUMDqY 1//EgIg== X-Google-Smtp-Source: AGHT+IFLRCJIhWvPJSHjOHmMfdHtiQHnRoYSTMp/a6ol78xUAn1ejpME245xEtPgzqIaNdDEPkgMc8SAGVRM X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:e7f1:b90:720c:35bf]) (user=irogers job=sendgmr) by 2002:a0d:e347:0:b0:648:afcb:a7ce with SMTP id 00721157ae682-6a97266deabmr35017b3.3.1723495679604; Mon, 12 Aug 2024 13:47:59 -0700 (PDT) Date: Mon, 12 Aug 2024 13:47:07 -0700 In-Reply-To: <20240812204720.631678-1-irogers@google.com> Message-Id: <20240812204720.631678-16-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240812204720.631678-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.76.ge559c4bf1a-goog Subject: [PATCH v7 15/27] perf report: 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-report.c | 55 ++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 5f609a7791ea..dfb47fa85e5c 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -799,7 +799,7 @@ static int process_attr(const struct perf_tool *tool __= maybe_unused, =20 static void stats_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); + perf_tool__init(&rep->tool, /*ordered_events=3D*/false); rep->tool.attr =3D process_attr; rep->tool.sample =3D count_sample_event; rep->tool.lost_samples =3D count_lost_samples_event; @@ -817,8 +817,7 @@ static int stats_print(struct report *rep) =20 static void tasks_setup(struct report *rep) { - memset(&rep->tool, 0, sizeof(rep->tool)); - rep->tool.ordered_events =3D true; + perf_tool__init(&rep->tool, /*ordered_events=3D*/true); if (rep->mmaps_mode) { rep->tool.mmap =3D perf_event__process_mmap; rep->tool.mmap2 =3D perf_event__process_mmap2; @@ -1272,30 +1271,6 @@ int cmd_report(int argc, const char **argv) NULL }; struct report report =3D { - .tool =3D { - .sample =3D process_sample_event, - .mmap =3D perf_event__process_mmap, - .mmap2 =3D perf_event__process_mmap2, - .comm =3D perf_event__process_comm, - .namespaces =3D perf_event__process_namespaces, - .cgroup =3D perf_event__process_cgroup, - .exit =3D perf_event__process_exit, - .fork =3D perf_event__process_fork, - .lost =3D perf_event__process_lost, - .read =3D process_read_event, - .attr =3D process_attr, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data =3D perf_event__process_tracing_data, -#endif - .build_id =3D perf_event__process_build_id, - .id_index =3D perf_event__process_id_index, - .auxtrace_info =3D perf_event__process_auxtrace_info, - .auxtrace =3D perf_event__process_auxtrace, - .event_update =3D perf_event__process_event_update, - .feature =3D process_feature_event, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, .max_stack =3D PERF_MAX_STACK_DEPTH, .pretty_printing_style =3D "normal", .socket_filter =3D -1, @@ -1477,6 +1452,7 @@ int cmd_report(int argc, const char **argv) }; int ret =3D hists__init(); char sort_tmp[128]; + bool ordered_events =3D true; =20 if (ret < 0) goto exit; @@ -1531,7 +1507,7 @@ int cmd_report(int argc, const char **argv) report.tasks_mode =3D true; =20 if (dump_trace && report.disable_order) - report.tool.ordered_events =3D false; + ordered_events =3D false; =20 if (quiet) perf_quiet_option(); @@ -1562,6 +1538,29 @@ int cmd_report(int argc, const char **argv) symbol_conf.skip_empty =3D report.skip_empty; =20 repeat: + perf_tool__init(&report.tool, ordered_events); + report.tool.sample =3D process_sample_event; + report.tool.mmap =3D perf_event__process_mmap; + report.tool.mmap2 =3D perf_event__process_mmap2; + report.tool.comm =3D perf_event__process_comm; + report.tool.namespaces =3D perf_event__process_namespaces; + report.tool.cgroup =3D perf_event__process_cgroup; + report.tool.exit =3D perf_event__process_exit; + report.tool.fork =3D perf_event__process_fork; + report.tool.lost =3D perf_event__process_lost; + report.tool.read =3D process_read_event; + report.tool.attr =3D process_attr; +#ifdef HAVE_LIBTRACEEVENT + report.tool.tracing_data =3D perf_event__process_tracing_data; +#endif + report.tool.build_id =3D perf_event__process_build_id; + report.tool.id_index =3D perf_event__process_id_index; + report.tool.auxtrace_info =3D perf_event__process_auxtrace_info; + report.tool.auxtrace =3D perf_event__process_auxtrace; + report.tool.event_update =3D perf_event__process_event_update; + report.tool.feature =3D process_feature_event; + report.tool.ordering_requires_timestamps =3D true; + session =3D perf_session__new(&data, &report.tool); if (IS_ERR(session)) { ret =3D PTR_ERR(session); --=20 2.46.0.76.ge559c4bf1a-goog