From mboxrd@z Thu Jan 1 00:00:00 1970 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 A1C377E782 for ; Thu, 18 Jul 2024 01:01:28 +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=1721264490; cv=none; b=bK5gq1nOEY6PfKy832kBFH28aKJH5o1YbpCi4XQ3vfN3RYHJ7t3iRoQq6eMmPNgEOeDplckVHJW6lehMd0bOtE1pcC5fgJCS9gjlp1IHplOAGEkwvacq12P1YZk1dcBvTvR5vHymBJbSbr0JbNeI5U8P3iPpTdWXXuX9952ZkAg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721264490; c=relaxed/simple; bh=kfJ6tvBAsXsU6JLfCYIrLBwtKah2svTIRlLfKRZG1DY=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=uBzYPt0AQdS2c6nVXtxXgljFZbdxmnOB8MJ6ADPwW8H3ck+hKD+9teZFijfndFmnu5C0xSRDFCOQtJAQzAuPWF3sQr6po44pjE/Rmj8lQGTLukSpGnRax29Mb4+KvDohesiZRc2XfsW/fdYPbGJqEawrLPTfdCdGzkI4ZmGzq1Q= 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=ZDBiD/jT; 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="ZDBiD/jT" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-664916e5b40so4736917b3.1 for ; Wed, 17 Jul 2024 18:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1721264488; x=1721869288; 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=UZ3Drtsbb7xK9GFR3k7+K4AhjLYb+mQoMq9GLVm8nd8=; b=ZDBiD/jTG8uTOomUobjsCAcsTfZJKCSZgkhhtI4hqF1/OvSGE1Yrr1hcwHfQvSPXF2 pUV1p4fE6YphoEiv7qkkXZrLHje/rG4XUjrGOSEMzZcdapD2Odmbz5qE77sj6rrVguPA 4aU3UuJRLhlMfc9PNDj8lPqthaPfVQU0odfpZ40encLBYfvz+u4O0ufRmiraFPj3vDu/ sTFqJ/zva95UJYbUT12x0Yr4QJtPm4vT88jQOa+PFSVW45gujh7G/0SnmimPEg0NN51k +Pkz5Z8iU19htzWNuZUibFh3/88QJ9j/JXH6G08rsrp2kvX6feK0SVppO+lHFYHVlm1y 5w5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721264488; x=1721869288; 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=UZ3Drtsbb7xK9GFR3k7+K4AhjLYb+mQoMq9GLVm8nd8=; b=ddH6UWbonTtEXjTeqlZHRUlFcBybTkuViuNPrhACAhybt6PaS/EJg5QBaySCJ134P4 1FMXWad+v1fE41e+MyfX/3fYNykYRD88M/J6fyneV7D/sovZqaI+3HCIPzxUnBcPIRtX 00el13ixYK7UW+xjce8K5G3C/WHIh6iFamO5Yv44wSfBtMaLJnzPFt1+C1oxUQvmTBvp Gm7a/kRMUI19caQ88Y2k5+K9y57+qIGXui4M2H3mLMCZpuK7pO+wYG9KFOnOJ3TevC1r lN0JRdKY6FG3uKX9KlvyIDRlFl5vYOVV/fSHW2/KPcZow4VV17hvkvDfl7h4ofIVb0r2 ljjA== X-Forwarded-Encrypted: i=1; AJvYcCUVqFnFumgqYnpMNUgweQMke081DGac2hnhcV/eJdzgrMhL5aemU7UJYVVOZwRm/ATwnIumL9zLTaB10bl3xc6ueVtsvIumWgpZSW0M5JMSBg== X-Gm-Message-State: AOJu0YwLXcPbGg0X83jpPZXLQa4fnYnyra5rShuT3pN9QQlt+/9sc++O AYwiG3hQPIGsrWuJ4io/z4KohdjB42W9Z46RrrVVu8le+VOsOsLCdLztpiMC7/GPBsQM9UFu+xA KuUZoag== X-Google-Smtp-Source: AGHT+IEMIegm6jNE4CQClsw7GOzZrobtpwCpbE8HwTGUbjxQR6jEtSbn4ARwhdR3fei25wrA9LB/QeoUjXvX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:940b:9044:fa83:4060]) (user=irogers job=sendgmr) by 2002:a05:690c:385:b0:620:32ea:e1d4 with SMTP id 00721157ae682-6660af16a6fmr758457b3.0.1721264487742; Wed, 17 Jul 2024 18:01:27 -0700 (PDT) Date: Wed, 17 Jul 2024 18:00:18 -0700 In-Reply-To: <20240718010023.1495687-1-irogers@google.com> Message-Id: <20240718010023.1495687-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: <20240718010023.1495687-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.1089.g2a221341d9-goog Subject: [PATCH v6 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-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-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.1089.g2a221341d9-goog