From mboxrd@z Thu Jan 1 00:00:00 1970 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 CED15197A89 for ; Wed, 26 Jun 2024 20:37:30 +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=1719434252; cv=none; b=f+Yb3u7+kju4Q0SJKLW1CjPoDrMkyiu0H9UyygW/mj0wINpMkg/mkgtfAQxqA0OWdvWMjuyG17x13TS2lTj+o6MW4qjsTnkShDrGpOQEn0epOhMTIE3Pb9I0XzGy3/X/HprpJp63XwPy6CBdHSHLoyFuk8DYmph2J2pT2eTZq2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719434252; c=relaxed/simple; bh=dyBAFLuB77d4FySD0MlGoqSmYtedpVSJiMTBSe2shXk=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=U1dVG+66P9M/JHUlPqNgY77pc9zaww2XNXn67Bcml63RXBvgU5Mh6p/gNTxApjN+zFejYidycmKGGjmiWMR1pd44MYlgb5zhiweaafrqiZO+sp9WD3WG+ajAozg9zWZnemZBHK/HlGMcDFrNh2+mGjQCDl7eFya8jVniTxfQVcA= 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=hhTj+lrK; 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="hhTj+lrK" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-63548741556so129708737b3.3 for ; Wed, 26 Jun 2024 13:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719434250; x=1720039050; 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=hhTj+lrKi3vUuWI2us2XzINk8TWvxDAHYTXFGaNBD8/wV3uikx+j2UY9sgZv5YALhr xaT3CtBq/xD3w60si67MpNJgGXqiBD9A3bJ8G9t9ukagSmvOM0GsIMA4n7I5dDArLZrp vz2VNdi513c9jtsaL8XY1k+A9qxSBFEzO6uFycV1x43CfQqjezX6ZOWxnPM2FCkQlPK8 RRt8ITaGQ0M9Oc5xQBKxJXnbMC27m7nstVgYlTOLzx5NzH7Wlu6RwM/kpwfM3YDPWH9A J4+b9z+vEQEhRRfO472AQK8hscUbMZe7Y2VDe+TAgfTC+WTUyEzFMTuPfBKCE8IvPyrs mvnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719434250; x=1720039050; 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=VEfx3Ne7mHQSubHmswvNmMnQPFel2WMCJ38aws9OKEcoltyKeciNrQHEALm2PTriGs 0Qe6oXtwSPolrh762nFpR3ypeN2f4s5GH5XyD5SsJ+HzQMQ6BI8skDopiKC/AgrSt1O4 suqdPxkyGVUFFS9Wbk7nj9ExDq8G/Qm1SBD1GbT4HkKIergg9B/S4vuw5CtpnKnKNaMT lss23nvZg6BChnTQr9H2P2acRHxjfN1WZDEiTd84dN1M7SMvGjaGqtnyQ1nuII3SHgof cU6buRUrchRNkxxMZzvFJ4crqZRt7JZytVYZmZjhWuMWmEiX1nuFwXMj/+16NkaS4TX6 eyXQ== X-Forwarded-Encrypted: i=1; AJvYcCWbWAFZW2Bxw7lmwQm8AKIDjNKnLnD1zyaYWR75bZcU6wvA6+5/P5Rc/jVOKwkKDaWZEJp5iZp7xm5JRts7T/N9CRV7s/fQilcYp8nAN0nrzw== X-Gm-Message-State: AOJu0YzVWPTTxlsavQ0qQ73RvOQrBTq6BGEqbsu1iJY4BhDv/7ELlHFV XNr0gsmiCyhGbyNxqZxatW5TF/PSXHxP2vcGy5j6+KGrezsPaipEtubUSdF1bb0gEyuQmAktP3M 9G9mCWQ== X-Google-Smtp-Source: AGHT+IGGXFqJD9r3IWjKrWLtrm1hPrgKca2MTAugIoYfk8/8JWlFTTbqc90peurLEErApNOT4jS+EyUzw51J X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:23a1:25b9:2412:56de]) (user=irogers job=sendgmr) by 2002:a05:690c:74c9:b0:648:db87:13d8 with SMTP id 00721157ae682-648db8715ddmr35237b3.2.1719434250039; Wed, 26 Jun 2024 13:37:30 -0700 (PDT) Date: Wed, 26 Jun 2024 13:36:24 -0700 In-Reply-To: <20240626203630.1194748-1-irogers@google.com> Message-Id: <20240626203630.1194748-23-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240626203630.1194748-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Subject: [PATCH v2 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 , 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" 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-convert-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, const char *output_name, struct perf_session *session; int fd; int ret = -1; - struct convert_json c = { - .tool = { - .sample = process_sample_event, - .mmap = perf_event__process_mmap, - .mmap2 = perf_event__process_mmap2, - .comm = perf_event__process_comm, - .namespaces = perf_event__process_namespaces, - .cgroup = perf_event__process_cgroup, - .exit = perf_event__process_exit, - .fork = perf_event__process_fork, - .lost = perf_event__process_lost, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data = perf_event__process_tracing_data, -#endif - .build_id = perf_event__process_build_id, - .id_index = perf_event__process_id_index, - .auxtrace_info = perf_event__process_auxtrace_info, - .auxtrace = perf_event__process_auxtrace, - .event_update = perf_event__process_event_update, - .ordered_events = true, - .ordering_requires_timestamps = true, - }, .first = true, .events_count = 0, }; - struct perf_data data = { .mode = PERF_DATA_MODE_READ, .path = input_name, .force = opts->force, }; + 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.namespaces = perf_event__process_namespaces; + c.tool.cgroup = perf_event__process_cgroup; + c.tool.exit = perf_event__process_exit; + c.tool.fork = perf_event__process_fork; + c.tool.lost = perf_event__process_lost; +#ifdef HAVE_LIBTRACEEVENT + c.tool.tracing_data = perf_event__process_tracing_data; +#endif + c.tool.build_id = perf_event__process_build_id; + c.tool.id_index = perf_event__process_id_index; + c.tool.auxtrace_info = perf_event__process_auxtrace_info; + c.tool.auxtrace = perf_event__process_auxtrace; + c.tool.event_update = perf_event__process_event_update; + c.tool.ordering_requires_timestamps = true; + if (opts->all) { pr_err("--all is currently unsupported for JSON output.\n"); goto err; -- 2.45.2.741.gdbec12cfda-goog