From nobody Fri Dec 19 07:01:57 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 572E917F4F7 for ; Tue, 25 Jun 2024 17:26:56 +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=1719336417; cv=none; b=F45LtEfFT24FZ46Rc56fSXoePICnXH8YI/37QY+MbTk4kw3L4TbEuHW1kpA+iJcIM42frELZgQZXts0XXbefktV5vJvSndWE9QWxU822ncagiVIOozajhkwjhMAsYxkMvn+DKse5mPIlZodrJ7h+7lqMRuwcyvPsS9vkIbaPHZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336417; c=relaxed/simple; bh=dyBAFLuB77d4FySD0MlGoqSmYtedpVSJiMTBSe2shXk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=dQq+bdz3TJXgs74IVSVNdXnYL87Kk9P1FkoPY0bhP9We50hMl+X1dDbqh83jgK+VdBI+kARV0lSCbjDfczwDUo1UjrV+J/cVp8tOgAsO2uI1jTwFrhniz/QvQ2/iNmSEXupD4BlrFSmKSY6rci7Gwb3FzFzX0/fmfVkvI3bFiwA= 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=lZ6NdaeD; 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="lZ6NdaeD" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-643acc141cbso32549587b3.1 for ; Tue, 25 Jun 2024 10:26:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336415; x=1719941215; 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=tAjCLL/ftZfBFw5cOoLeSIWi0+JxdIhk3yYIclIyM/M=; b=lZ6NdaeDPaH3i9fsDf8R/0pzlbVVPannj2L28zXzvrJnWP8BsEsQ7B58pbxYxXnP2X MAxiOhNVaFmS1fgGhaqjCOLaJaCreZ0D0RzR9O4kXPz4W+cL7iAM/5ge2RK4+VeSubN+ fzia+i2IWnr2Zz0QvN7hqepEFdgNkOHxbLRdWKRcxxn2JGxEdopyyCq6vJTuRgz7vLw7 EoYC8mCZB2tX2iteocLx2mXzQnN30uzM9Eh1mNSWSB9tm9G+gnORcp1mNIkdIRrAXjsd VthFzd/eYJAmeksdvcHpA1Dz+Wb8BZZz39HRlff8O6KIdutM+lAEo7l2oWyA8bgCa4H/ YLcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336415; x=1719941215; 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=tAjCLL/ftZfBFw5cOoLeSIWi0+JxdIhk3yYIclIyM/M=; b=JC69UbItnBoHoo5uqQpAk3t0srdss/KhzJqcAp9PclrOXeZ8rIV5OQE/4n55xOnd+2 pclgFR+KhuXxVVNanfueRaOuqlcNvYzRBwMvdNCcd5ZfORQ/u1JfyK/Pc+/tcFCkxeEq HzMKGtQx3eED1IcGUSvIEveJhRSj5Tbdo409XgU9FhiQeX9FFcwICPTEvwECbk05QyKS 83kF3JjUkddQlHpumgdmrRdBIOGr6rXdjUm2Qx/xfr7pU/Nb9jfZ23LlTUl5i1Janz5R egHW+diLXezvT/xMgKJbRWyNPaYEarZ2E9f8y22teTwg2Tpu0OjUbSCCpeUf+50Gy18Z oytg== X-Forwarded-Encrypted: i=1; AJvYcCV0V1CbuksTb2x6aLxlp9IDAAngarqx94DqgbZuJnf3q3XywmQDnViT+KTKFc3Q/yoJt+sHxQuhyP8GLHFEWyNp6x7YapCrru50+vYe X-Gm-Message-State: AOJu0Yy6dWDGzpm5mitkW7nSYRtdEYUVIwah4cE6bw2aHdNrrYUE7LpL usBtB/IFNAM8yDenoh4GvrQR17yQvsIwjn02XFcTu36yXdzezsP0KpFsCs2yrgUepoD8Z9EtOFO wSp1k6w== X-Google-Smtp-Source: AGHT+IHrK3RRi7tycrRZAYc2YvJzBlzr7KTEgMOmkpv40UHUsdr9SHfnbmoDqJX2YXdlS2m1S71lhIGMfr6U X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a81:9208:0:b0:631:4588:4acc with SMTP id 00721157ae682-64242491f26mr559437b3.0.1719336415369; Tue, 25 Jun 2024 10:26:55 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:57 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-21-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 20/26] 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 , 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.741.gdbec12cfda-goog