From nobody Thu Dec 18 05:31:00 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 A7B08DDB8 for ; Thu, 18 Jul 2024 01:01:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721264495; cv=none; b=M8vEQilMgcjqxCf1PNtXawiI/Q86rc2LDla/oA12WvczxEIXFtHWzGwAYP07WiWRaQHzIFdsod2xiM1Up2tD16kNrTVOJrmm1EJMO0r0khgWplKbhL1XhTOUkVg5v4Df9REVkwlotCgAdovfNeDNFvlW7XlI6Yjr6aHIISER3js= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721264495; c=relaxed/simple; bh=cmLg3dO793Vu8RRjxUPuYw4PgNi/G99PcpLXCc/ZGCo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=aJHoZt4tcWzG4HAYo/2hd5tts7QDIJu74/t9MBOg/GSlSdhDY1Fum73ywxnCvWeYpi3hkDox1WPBrZ83u21YZ5U6niS7Thfn7KzDN7abXsuThBrbljrPc+x0/6/EDlRETuUsh16TT8h3vnnqntUSDvB+s81O3sw000FhYnIHMwg= 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=MA4DcuZc; arc=none smtp.client-ip=209.85.128.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="MA4DcuZc" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-664916e5b40so4738387b3.1 for ; Wed, 17 Jul 2024 18:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721264490; x=1721869290; 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=Clkf8d2hIy3r9JhAIXh+9vb9zWkbL7cEj4ImfbK/zRA=; b=MA4DcuZcWGdqDM1AW+3Y/o2/J3M7yo4YWw/Cj0fT0yo5AwcPqSfZ0kOwHp+rErHw2o 3mjEtCNz1nkT4jLWW2e+T2LvQ6sloUuR4dLiwDq0LavAkUDFdK0bnjFRqK52+9eA68v+ SFWJUvTyVTPBqxDCm2u1e0hgDalKUahzdTHH6nAOEItLcrat4uxYy7ch8dCcmKiYHgrb ZkAGBiYfJBDGydY+LtITroMfDHT5gdY7dA8NaEmn7mvF5hmfuZhlCTD+PC1SZOQUb5CI xfPRua1tG+C2EozP5gTf7Dhe8LGtQoOAm8KLOjUgbHlG44mB9pBWo25qRQ2qRLJC7QJ/ xmug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721264490; x=1721869290; 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=Clkf8d2hIy3r9JhAIXh+9vb9zWkbL7cEj4ImfbK/zRA=; b=iR3OYBY3j6ifyXLzWuGYef99fGgc+mDk5W5sR8jQvLg7XFztX8LEd2/duU1Oi5AF51 w7/+VNdF16gmsuqcsT9NdS1PhADtth49Z+OhQ3EAL6E5+FTSTcCAVrTh0XqetI3qwzKA 3+HTdzHv7pNphK522Eu0Fo3BWf+AbZP7lf22P6LwdVQ6iCIU6CZ9jFx5d3gF+R6bdDsa nKi6Fmv3k1ttPNx7cIM1tXmF0gTNZCCIfmu5ebEclxNqJjEMmgb5t7H46B5NcQQGJ3zI 1qBjLCpHbOp5uSqT1tdXCNrbXpvda3c70pnrx/BxdBM5imzGWsSv4g7BSy4oQ3MWJxkq vAxg== X-Forwarded-Encrypted: i=1; AJvYcCXBdZ7HfIZ2fDWUQtmVy0hnkJOVGmDOF16upl/HXfBv7cs/oOX7JqMlZ0v9DCiiE/82thzwBF+074mFiD2LnahFATf/UObxsNAn3U7M X-Gm-Message-State: AOJu0YzQ8HzNpgc/cHuhlpVh/uecs59NSm+GDAyoC9d7SPeAvpQIi76B vVSo6cb0ZhGLQicObD5xnxnNn1x7JbShh6HbdFpFc+IJ1hrHhHxbM19vTrAnc40wsZ1RHIq0L/H FFKZWPQ== X-Google-Smtp-Source: AGHT+IG3uW51DaI0jwt64D2aVkFsd0oCKXhiJ/qB6/tX+ACDLixR+siknXwDm1ELbOkMHzZQc1ESlEtW9OiS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:940b:9044:fa83:4060]) (user=irogers job=sendgmr) by 2002:a05:690c:2b04:b0:665:7b0d:ed27 with SMTP id 00721157ae682-66608017be9mr125757b3.2.1721264489810; Wed, 17 Jul 2024 18:01:29 -0700 (PDT) Date: Wed, 17 Jul 2024 18:00:19 -0700 In-Reply-To: <20240718010023.1495687-1-irogers@google.com> Message-Id: <20240718010023.1495687-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: <20240718010023.1495687-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Subject: [PATCH v6 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 Reviewed-by: Adrian Hunter --- 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.45.2.1089.g2a221341d9-goog