From nobody Thu Dec 18 05:34:36 2025 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 8E34F19D8B7 for ; Mon, 12 Aug 2024 20:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723495700; cv=none; b=kTBokpHF3w7hWhixwvnYeif3RsWGJXKok2jHQXhyZVtF1knt7NsUGcUDjQrfQJPLY3YLSYVAEIcizTkNJgWSyrb6fsAvI7FoIBIlzQtByzCBjFeG3MQC+Q5/aWgbNroGB+5U7unGc6jDFjbgfQfjXGixUv2eiKBIjXgxXgVCn2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723495700; c=relaxed/simple; bh=6SbW11s05Qr4nY+NcFpPuE26rfIGtkku1+1qcEZhCNk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=tr0s1xUl/yCHTTxsFiGdoYqvL48W071KB/Rljk3i85UT9h5CgC+i2Md/Amnqg5KlmLPQN2euSkBFgGVzp4tHWj6zwO9KKe8WxEYXMq2WJ125IMAkryajCZ1nJLsGIDPdHN2jNoPEDbI6k1/sEt0qABzCvWxjGxuYW4h7sDMo3nI= 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=s+usMIjz; arc=none smtp.client-ip=209.85.219.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="s+usMIjz" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e0be2c7c34dso7570316276.2 for ; Mon, 12 Aug 2024 13:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1723495697; x=1724100497; 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=uJSUXUdYfftsnAfnEFDlpk8Nwh4UnwypAJ8imZ20tFs=; b=s+usMIjzcsQnsgE07MYsXgNkxiqv65LimFEuYV60+BgJYUjHWkOulyBACPChTHHfmn iDoGJldM5ZnpOSWeLnQVbYpIuWaMBnyc1UmJCOnrE7tsTUH1Y4UlM5YJA8vqQZxlAoQV xjiD0FKzkpNCmRVe+OeOjtZytnrQqDe5kJjGfw5hRZbCKMDxLE83ylsjQ9ajdStWK6pr RZrWAr5biFfeLv8R3q2f+2oe+ZiXYhxACbFbNy2i2Tq5BSJTQVQ7b37ZhN3AEgeQ4Xpb 49s7qbU093aDyNQVrC5A+HzP9tTjEviAson159DwYuS29FJi0bUOALB5yaY+A+Lsquy6 K9gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723495697; x=1724100497; 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=uJSUXUdYfftsnAfnEFDlpk8Nwh4UnwypAJ8imZ20tFs=; b=Tcx98Ck5M9ZLRF40te4kzkGRIgTLWpL9O6QbSvQAyQSKd2+Sp+asJgdeXZOfRa/Kms lqYrz7d3EespFeUr2HXqNAgCUj7IPOO1TYz7UtfhUBETq+PzLWdccD+5utGlqHQyHiwL Dlnb06eBR9M2nXHtpMJHlonPW+qfaPRn+NT6t4yhxEGnvY/s29WU1YCmXVxaMHzII7A0 o4wL1aGSSWI7h8T9X/NMMDSkOKjfcDiT0PPXZngcE98qA5GDdx2eiEYKaN2nFcdGwQCi z0Nt4/cvmzfitCxkZhJ0w7mdFZe6NpoSEkEzHvltBleBrZMQNlclIcii4kwCiaZI2R/p +Gwg== X-Forwarded-Encrypted: i=1; AJvYcCVmPthCWMqrOIgSRheccCqEPHTuyiHVhdn3UfXnx1+uIrLBntScA+9R4kjcVcezlRT0IauLpS4ejLIN6Go+cEx7j1/c0eR2vAgvZD6a X-Gm-Message-State: AOJu0YwY604rR705UMqBtnfO6YhLOmYXgif0U9tAD5VQzm6wyOymTdY8 PBahPhLPHABTnxZhgMf78b81MR50uOfwzWz82sMCy9dnMBpRGRHIvQ5ZF6yfxRFXa5zNjtS/f5B qcZifaQ== X-Google-Smtp-Source: AGHT+IE2pK0wYfiv8oc0VZSUE7OVPqkqcX9EbQm/feBFKAubLZ6JT4aH+pOipQ5xDduOtnnesoVffuXHgpL+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:e7f1:b90:720c:35bf]) (user=irogers job=sendgmr) by 2002:a25:8d89:0:b0:e0b:c0a5:71e2 with SMTP id 3f1490d57ef6-e113d2c1aa5mr27234276.11.1723495697319; Mon, 12 Aug 2024 13:48:17 -0700 (PDT) Date: Mon, 12 Aug 2024 13:47:15 -0700 In-Reply-To: <20240812204720.631678-1-irogers@google.com> Message-Id: <20240812204720.631678-24-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 23/27] perf data convert ctf: 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/util/data-convert-bt.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-conve= rt-bt.c index 9e2170604b66..021e9b1d5cc5 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -1607,25 +1607,23 @@ int bt_convert__perf2ctf(const char *input, const c= har *path, .mode =3D PERF_DATA_MODE_READ, .force =3D opts->force, }; - struct convert c =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, - .exit =3D perf_event__process_exit, - .fork =3D perf_event__process_fork, - .lost =3D perf_event__process_lost, - .tracing_data =3D perf_event__process_tracing_data, - .build_id =3D perf_event__process_build_id, - .namespaces =3D perf_event__process_namespaces, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, - }; + struct convert c =3D {}; struct ctf_writer *cw =3D &c.writer; int err; =20 + perf_tool__init(&c.tool, /*ordered_events=3D*/true); + c.tool.sample =3D process_sample_event; + c.tool.mmap =3D perf_event__process_mmap; + c.tool.mmap2 =3D perf_event__process_mmap2; + c.tool.comm =3D perf_event__process_comm; + c.tool.exit =3D perf_event__process_exit; + c.tool.fork =3D perf_event__process_fork; + c.tool.lost =3D perf_event__process_lost; + c.tool.tracing_data =3D perf_event__process_tracing_data; + c.tool.build_id =3D perf_event__process_build_id; + c.tool.namespaces =3D perf_event__process_namespaces; + c.tool.ordering_requires_timestamps =3D true; + if (opts->all) { c.tool.comm =3D process_comm_event; c.tool.exit =3D process_exit_event; --=20 2.46.0.76.ge559c4bf1a-goog