From nobody Wed Dec 17 12:17:41 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 EB8CA1741CC for ; Thu, 11 Jul 2024 18:00:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720720850; cv=none; b=TBBPOhLGxRf3rOr9QmPY/WAC+sX0HMJJ+jOoFinSowCf1Vi90C5iZ30aEST3MPw4so05oK6/EbmGOcLdCoFkA3Md0rK6VD8VNenDVbXkOQwjTFFkKtl4fMkShs5wg8j2RSt+NXdcNu57RQkjJ2tmcaihIRrzCrBuLxQesblCXZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720720850; c=relaxed/simple; bh=Poyvi9HGQwQC12qF/8SGE3BV1oK/lWq58PuPKRxVztA=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=dEsH3vllyJ0xqV50G7Y+YmxVkCfRXhaliz65PddeIifR2v2Y80ceZjSrzFU084g/AgMz59l4HBY2bwU+7bS4HxdfqOj5BVcLS4M4WA1xNakjIY6dVHXba8otYVVTK1btiEy+EGhVwd0kvqQ9ejb0V37KvB4e91D/uLOutX9lcvQ= 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=mqZdmlmt; arc=none smtp.client-ip=209.85.219.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="mqZdmlmt" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e05600ade22so2354629276.1 for ; Thu, 11 Jul 2024 11:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720720848; x=1721325648; 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=QTSkE2wJ/0ArGbZAlv+dCStory8B9jtqpGvumW8ARXs=; b=mqZdmlmtTRksASY8sGwnMjZqJBv18zosDKEGMjsUA3Oa299TFariNkPYHBlZblBh/A JYkb1B4S3kFCd+gR0Rgies5QNlmUD5M0cYt+JvmGx6y+Drdw6iR24nncvJd/mIp/5+ba UgEpuT+U7I8zmJAHAOJWIS70q1rG24RkWdEBnQDXzxd7nIqYmEtEBO9xvM5FO+nzQZZX 3tNhPvWddAIGJve7cmzsJc8Y0OfgcskDEf27CvavSXipj3qI4qfMWwbMjnRG+CGsp95j /C2WS0/0pOXyWxEHMLrppJIfzud94rtrLJUQ/qpow3HJWdeqrHk7FfS/t7enuBA/NkgT dTjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720720848; x=1721325648; 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=QTSkE2wJ/0ArGbZAlv+dCStory8B9jtqpGvumW8ARXs=; b=mfuN4b2LtBsZvr8/S1aCrfwN48RGh0mGE7eAM9xycLM2soIOnNtXUrQjeDBrIFYF/F joOaGTJB6B0SGYQvIaEC2Ax4oih3ioRlW/OJC86XjPzxKigtvz8LIGJLmXpEgxzkjrM3 7hNBrxx47ZvNHu6v3zstmp1TzO76/zYjPeqbTy57eGar01LqRYNZWJdxqwtgxuGqJVXS 94T+EwUUaWmaMK04OeZma6yAFg0l9YbLI7+e+6ODOv112dgR9blFJdRdA9aQLzm+iBwX MWzPCDK0k0DyNiLAXSzKabeyGQw81eFZxkDjoqINI6aLKh/Qw3ANZxKliliyafPm6a/z 6yQQ== X-Forwarded-Encrypted: i=1; AJvYcCWd3tyw9TEUywZSkFi+n5Lzrxy7gt0WR5w45Lr8WLg03gNlKxkfDa+cFU268HUreZRwQuQB4yewYN9Nx2tCTkZmSwukOlQDskGVNDLT X-Gm-Message-State: AOJu0YwLBXIMo3hDk+Wu5I8u52Efeyaeb9NkYO0LM2Aiy4S61c2WpK9u ASh6CxP0MNsEUezXL1s+opXgprXwOMF3QHJvqZlCcKgcYObA60skjktNQXPN5q/zQCg1Pb6wIVN hh6ktgA== X-Google-Smtp-Source: AGHT+IGlt20vZYur011SdPu6+QS+oJZqOUoXE1o+BRrQgv2s0bzDCcgJLzE/EenlRtLxPWLHv7UOmrxEaNS4 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:bd08:a1e0:c497:32db]) (user=irogers job=sendgmr) by 2002:a25:7d42:0:b0:e03:61bb:6032 with SMTP id 3f1490d57ef6-e058a47ba0emr1176276.1.1720720848062; Thu, 11 Jul 2024 11:00:48 -0700 (PDT) Date: Thu, 11 Jul 2024 10:59:56 -0700 In-Reply-To: <20240711180008.188906-1-irogers@google.com> Message-Id: <20240711180008.188906-17-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240711180008.188906-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Subject: [PATCH v4 16/28] 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 c402d9b3dca6..cd5caf1c974c 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.45.2.993.g49e7a77208-goog