From nobody Wed Dec 17 10:47:43 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 0662A17E446 for ; Fri, 12 Jul 2024 18:12:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720807981; cv=none; b=V8Ka714YG7h1bdDSngQgptv/XyX7k6uun8GYl25IKl0wgxhIp++aoWUPt50a9K1yyEzPC/xbxp15zzs6JBtNBOOA25uMQG9OJOw7FuKOGYct8itDAmH4y7UtWTJNDvo8CpVEImB0bA1aolNgq9jLYmKSRrXCQqxvhCAWW6PnoPo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720807981; c=relaxed/simple; bh=Zg5U84S1ofRY2jiFZPVeAVTNxheJYumCpecsmhgwjUo=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=gLTMI7tWrXfu5EUvbntgoktZntxw+NqZbwVhcexHM3G32WsJOwEb/RoG1eG9aFsxPOxjUV0mCf1XPXerxNv5ZBCzF6OCM8pcrSF9K6HirvEaXB9Tba4L0ezMXI9pK5ssR7NyNJb5k6g6PFH2clt9oXk4zoDgZ233JDKGCgecpdk= 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=bOD/Bbt9; arc=none smtp.client-ip=209.85.128.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="bOD/Bbt9" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6533680c788so40101197b3.1 for ; Fri, 12 Jul 2024 11:12:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720807979; x=1721412779; 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=QqtdDMsD55pEoQfMNz6zeYZQAoeVSzSneBvTBBwc7VY=; b=bOD/Bbt9p0oq+UIlI6yQUt/3spsVvCQJ45K8QxXKMW+tF/zvIdPBb34i+2VMJy0Gl8 2RFtgNNDXFTZb048q++osDhntcY833jldIYkcECeAn0iP8agOxhP/8D8AdTYsHoZ+/QT IA4TY6qYRo1am7amPf0sOP2I+WC5jIWaqkUTTy46mGkW0y0G96BLvdaVCcGBS8FwhRYo F69fXKDa4pOmNVvEHxRuZR+JvTHUZ+s8DjD4wWMbmIZq7gsxb2fUJzW02bmPMkOopS7k /Hrc6TMetBU/d3Vao7HD3M60SXQZeDOkbQr8BFUoyN4QyoKYNVESbmY7QM7lymbtmUxH rvvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720807979; x=1721412779; 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=QqtdDMsD55pEoQfMNz6zeYZQAoeVSzSneBvTBBwc7VY=; b=E7JXJT9aWDM1UU7Z7n+g1bu6u0lyUMC75kJWKpWmBxQMgo8Ey9M9dUNisirdWUZD+G eygAWkW+auAKdTIhEy0+3i490KNz0jPfDCpMyFgIP9tCs70knmMCCIwsI8RKBEoHJFRB IwUFlzzSVLn+JxVt3YndrFxyCKIbcDcOvCeNg13WW0gZAJ1DGXtgvMiLCf4fKctWqAze nKZockqcI9SohSphfY/0T77WGi/eXPW5VGvIUu0BlDVdBrcTDs6B0atWYPL8dQCfrnrH b3ilaNhrZ7yHLZVcGHGCJ9SrSz0874TGtVBBp1DFSOXsG7/rLRqvtqnsk4y0L9jx0XP2 dNyQ== X-Forwarded-Encrypted: i=1; AJvYcCUz4CeTGz0X+FqOa+R3j8zUuu2TirpI7W1muwTT6kXz2N0WbdWhKsG+7dJ49Rx3ck8g+X5XkSxGp6YMPHzD0Ga00xSr97DBNAq0teV2 X-Gm-Message-State: AOJu0Yx06WnWR0Ta+mLrvemG0qjHKTm+EDbduJT+T81I+Yz/ecGXq6iq 0ksHlR+VBl0vStBfG9FuRo+JotEE5xmuGfn/SiQo80C5MCt1nrraqiMLx5tosSOeueljwkVG+JW FjXooMw== X-Google-Smtp-Source: AGHT+IEnchojDdZ76Vxn9f7h4DhTLRV8huHLPOkuO6TlwqAevAk9P1WjzXQqv38Bbw3agIDos4xIMuc27TcD X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:2e7d:d47a:a0c6:e3b1]) (user=irogers job=sendgmr) by 2002:a05:6902:1208:b0:dfa:48f9:186a with SMTP id 3f1490d57ef6-e041b0370bbmr26212276.3.1720807978826; Fri, 12 Jul 2024 11:12:58 -0700 (PDT) Date: Fri, 12 Jul 2024 11:11:03 -0700 In-Reply-To: <20240712181108.475336-1-irogers@google.com> Message-Id: <20240712181108.475336-23-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240712181108.475336-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Subject: [PATCH v5 22/27] perf data convert json: 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-json.c | 43 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-con= vert-json.c index 905ea9823f9d..20bfb0884e9e 100644 --- a/tools/perf/util/data-convert-json.c +++ b/tools/perf/util/data-convert-json.c @@ -316,39 +316,36 @@ int bt_convert__perf2json(const char *input_name, con= st char *output_name, struct perf_session *session; int fd; int ret =3D -1; - struct convert_json 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, - .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, -#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, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, .first =3D true, .events_count =3D 0, }; - struct perf_data data =3D { .mode =3D PERF_DATA_MODE_READ, .path =3D input_name, .force =3D opts->force, }; =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.namespaces =3D perf_event__process_namespaces; + c.tool.cgroup =3D perf_event__process_cgroup; + c.tool.exit =3D perf_event__process_exit; + c.tool.fork =3D perf_event__process_fork; + c.tool.lost =3D perf_event__process_lost; +#ifdef HAVE_LIBTRACEEVENT + c.tool.tracing_data =3D perf_event__process_tracing_data; +#endif + c.tool.build_id =3D perf_event__process_build_id; + c.tool.id_index =3D perf_event__process_id_index; + c.tool.auxtrace_info =3D perf_event__process_auxtrace_info; + c.tool.auxtrace =3D perf_event__process_auxtrace; + c.tool.event_update =3D perf_event__process_event_update; + c.tool.ordering_requires_timestamps =3D true; + if (opts->all) { pr_err("--all is currently unsupported for JSON output.\n"); goto err; --=20 2.45.2.993.g49e7a77208-goog