From patchwork Sat Jun 29 04:53:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13716808 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADC28C27C4F for ; Sat, 29 Jun 2024 04:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=QxE8zaj+b5/x1bVRBgpaGx+eOiWA4VqUOBFS7RhEkrQ=; b=FfcrbtpBo7kvYR78GX2xQNSxQX WdNKLYmbwiutgtKv0lBG6uE/GPMOHYUDT3A3LdcR4OZ/nDj4ps/6K/jqQAgNiQvg98r7Zg2pzAyxF qzSDIpWwlLRPraA1vJLdXmGR5F4xb9B/QtXYFLbYcAStZ63utwP7+dL+1z04moeoWj3E3yatNzIhm t9N5KfJTsX8Vx5x0TTtTSzNiXKjPjvyXk1Ivo7IZG1tyRqcFWYCvBLFCCBvRgg3paUFg2jwzaQHme 34diNlzle1W0OHEzbIZEP8z/utnzjSpupjGEChbreq+GJyvnE8eWXi0dQZHxAqLcmYubSNiZUdeYD VlVB6erg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQAV-0000000FtIi-17CT; Sat, 29 Jun 2024 04:58:35 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNQ75-0000000FrVu-2bHF for linux-arm-kernel@lists.infradead.org; Sat, 29 Jun 2024 04:55:05 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-62f43c95de4so21871737b3.3 for ; Fri, 28 Jun 2024 21:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636902; x=1720241702; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=QxE8zaj+b5/x1bVRBgpaGx+eOiWA4VqUOBFS7RhEkrQ=; b=UpKBDWIs2oZpgVMJzxSd3dUOOMsTpInsPRYp2G6xap6SAktTk5gbmxwNp3Mtka+7J1 N7cnrb2723aSllKZ5tH7StXvlnlWG63SIEBlbii2aPb9ZIF9HVMGSOdDhZkuMdbE3AmM oaolnOmSh7XmXK6LePo11/FuKjynBbfyL9YuhDU2jbpSDE3VNxCvEaSb8tchqZqFN2zt bjzoCaUXCJbzAHyXjC0kHtytD1YDrixi0U6vut/fPEJ5hGD2MsKAMcXVeulzZwtme6DS BOBfPoKV3m66fr8kkUdnPUkGpGfFVATpjd/i7nC7dYmnwGDGksqxOImefDPwHqBZO8d2 Aa2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636902; x=1720241702; 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=QxE8zaj+b5/x1bVRBgpaGx+eOiWA4VqUOBFS7RhEkrQ=; b=lzezD+9uauV4iQBytRboJ/Tz9mLGL+dFzUZ94qhA3h+DPz5aNyx0v6/AQ+Bq1Bvo/K jz/xE3+LiUH/JXUpgHyRDJ+qeVrIPA15wXMGg0z0s/7kYrP7/GiZkTeupLWNAVhlw4dm inNP0M8VstZ16a0EWpyNPwHzwTTI+fKpBUWAuRiGCJLw9cH5Z65zPZ4n+SLNj7RJCzdD HoVaXRa7WL1xyqRDKZI/d86JEfxg8VVvvGipdKhJepHFtJ61Vn6Hg8ngQj8BXBW7Q8Zw iSUBqCNk4JKzq7OSyXjflK1U8EtKQaNArDK+fU0kMBOrCc/Gy8uuNU2mOB4xvFbig9bq jyUQ== X-Forwarded-Encrypted: i=1; AJvYcCUtz7vy9Mm1EcNNAuxKYLwYwzKASCY/gPgfBKPHIBcrziKgzzPJGAtWBNk/n2EE2Gts5mLMjYa5epNhSYu/DUgpn5ackhDk28QDXVGyLBiQKnMP8h8= X-Gm-Message-State: AOJu0Yy6SXqB8F1WhMhaqioioDCg5qPVf+flmsLdRZ0M21/v6G/JRulE gKOaOLeVVt2DPSpEkPeb12IHRkFbDJWgmhyc8s98sPb1UU974fof8xOyeMTygcqyo/4aj1dEC/B ymkDE9Q== X-Google-Smtp-Source: AGHT+IFYiat8zAOFqEhWzL8cJxNr/uK8cs0d5B+e6TJJDnVINuyMYTmdafGkH7qdb27g2EciP/a0Ubwb1XCu X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a81:83d1:0:b0:64a:bd29:c5cf with SMTP id 00721157ae682-64c711459cemr44947b3.1.1719636901688; Fri, 28 Jun 2024 21:55:01 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:46 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-25-irogers@google.com> Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 24/28] 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_215503_751066_5FEC787C X-CRM114-Status: GOOD ( 12.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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-convert-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 char *path, .mode = PERF_DATA_MODE_READ, .force = opts->force, }; - struct convert c = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .lost = perf_event__process_lost, - .tracing_data = perf_event__process_tracing_data, - .build_id = perf_event__process_build_id, - .namespaces = perf_event__process_namespaces, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, - }; + struct convert c = {}; struct ctf_writer *cw = &c.writer; int err; + perf_tool__init(&c.tool, /*ordered_events=*/true); + c.tool.sample = process_sample_event; + c.tool.mmap = perf_event__process_mmap; + c.tool.mmap2 = perf_event__process_mmap2; + c.tool.comm = perf_event__process_comm; + c.tool.exit = perf_event__process_exit; + c.tool.fork = perf_event__process_fork; + c.tool.lost = perf_event__process_lost; + c.tool.tracing_data = perf_event__process_tracing_data; + c.tool.build_id = perf_event__process_build_id; + c.tool.namespaces = perf_event__process_namespaces; + c.tool.ordering_requires_timestamps = true; + if (opts->all) { c.tool.comm = process_comm_event; c.tool.exit = process_exit_event;