From mboxrd@z Thu Jan 1 00:00:00 1970 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 85AAFC2BBCA for ; Tue, 25 Jun 2024 17:28:56 +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=gHFcPRP+yhEWi0robOtIeOpLSabhSBGQ4xXRLMmGCaI=; b=gnwW68LlCyFepDX8dWJx0qLqG6 k00t5qNmcc4MvESFKVzbqqMlyvOTK8xoD5GYXJgpMip5YBWZFQZdugkCE6DEn5fQIYuciv03v0ddd GxJSZXWBADSKVS4oP/y9FgsJhS6nQHVOr9pKZ35sC6vPXMJF/so0hqTSpfBlh1l05C5tCq1Fz1jo8 w4S1SIhtaZPOGPFse41y75zltyRvOPiSh92OPnvl9lJW0sGlDO4uiWwhshFGcMRJD8SF1ji4J1ROt hyLSWBSfauSgDKcQgCoaGNN76SYSg905Rn0x4TNZwDoJf+jq/4+5YUAt+IoSs3G720Lf47shw4LsG cL19qU9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sM9yF-00000003u4w-1SSN; Tue, 25 Jun 2024 17:28:43 +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 1sM9wZ-00000003sva-3Ek6 for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2024 17:27:02 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-643acc141cbso32549997b3.1 for ; Tue, 25 Jun 2024 10:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336418; x=1719941218; 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=gHFcPRP+yhEWi0robOtIeOpLSabhSBGQ4xXRLMmGCaI=; b=xNlzKTSsemBfS/N9AKRz3mHDjLelJ9Q0K2LrNf9x5FHGMZ4TiGuBeeKzINzNOY+9SY x4J+nI1IUqH4F3icOZWF5iOte8RLkj/lwsMkjIUhGUfMg1QyQ7Sd/blIO/7L8YS5vf4+ wdxVqPgxXs1FgUiA4mnV7GpR1lk2CP9/4qs3KTErb82jPhZMPa5ft5/yHjwNOEc7x58d nk2zk/UGIdnJur8L1mPS2WTHiNojRmy9jJlVTETkGFLaX22zkXyTe7k1a0qOC5hzXfLl DgDIKJ4UnYHET1JbM8TFZ/aIcrdnW/rGkIA5HpArHlPYjvwg6Dw8gvx5afpdanKKbqn5 v7hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336418; x=1719941218; 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=gHFcPRP+yhEWi0robOtIeOpLSabhSBGQ4xXRLMmGCaI=; b=CPeW7NnBAcjij7Xui1djhLLMzUzGl3bKbIHuDRmpd7NNSGHuJ4ijzZeqlziMjMRB83 a5kTlcsLHyGs7Ip84ZErhs9I+NW2vMN8E0aNVbd5X+HgyFIBWhPhQN/NqSnsAyVcXFZu whYRpU4iWgm//gmjltr3DtZi7BiETC/+ehwR9wADuvs2N/GQAuBVCVAW6upufBHWDm7+ KwpjmcOWWFToBw6BBXgP0UlpOb4VGVBQpHezdSMLdh6t3HXkTmM5lsaJHRTVMIl0YQNL lIZE8ihTKobimvJrHvHaU4PS/1ui7bkwNqu4iFvMXwxOIlRpZALjBnBvL7dahHTC9rvB Fylg== X-Forwarded-Encrypted: i=1; AJvYcCXCu05mRdDpN4Q/7cY6JIdet2pFt4UvaZG8VX5Y9Ll7HQPG7CFY1oa/8zf6vv3eGzB2cfZbYx+qYpt/G2IXJoJDRU3YN7zB7TowHcjc9pogrmE/z4k= X-Gm-Message-State: AOJu0YzLg7lICB0TP09buJIwEjQndV5hZDyd287kidHFRnngqHgUaWE5 JDYCr57Bsh5tE+TIzWLYYXWuPXD5zHl652oQDjUmYz5KS2ucXLO5cNNaLGX+k7aMbtnRuI92aWM 2ckCCbw== X-Google-Smtp-Source: AGHT+IHvubIUZhjEok3/V/kgZ7MsIbdXa2+oaKX/HdJ6s7+Z2Phn78YjiEcP/gWbJXNedxraCdMON4nnJvNd X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a81:ad12:0:b0:627:edcb:cbe2 with SMTP id 00721157ae682-6424dc5e95emr531847b3.5.1719336417810; Tue, 25 Jun 2024 10:26:57 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:58 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-22-irogers@google.com> Mime-Version: 1.0 References: <20240625172603.900667-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v1 21/26] 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 , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240625_102659_999645_5816B957 X-CRM114-Status: GOOD ( 12.53 ) 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; -- 2.45.2.741.gdbec12cfda-goog