From nobody Fri Dec 19 07:01:58 2025 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 9E55F17D890 for ; Tue, 25 Jun 2024 17:26:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336397; cv=none; b=LiHvIwu24TSsTGTIAlTpcEkZqSubsHQexGyait1ysew2jYd+bw8K2MYrUAvQ50dhBeEeMM/GI+jjJCHcdEigZ+n9c2lyGTD6H6M8TLjneffAqmunqC6rrqLvGPvxfcqI227g397Jx3yUzLznJRsEwzLAadog1do3bAJ3iRUKi4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719336397; c=relaxed/simple; bh=WRHMheJp7s0UW+rmOQwKCmWPOpwEdqZ0h0girqg29wc=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=UdegUJnj4PAh/3/0ZW7t3j4W07S+AWCGbswR4c4TED9nQHzrS5GY2WjXr5h1QiLmdfzxajyepxtnKMofMaiEBq1UGfgfVGW0gbbnxxb8HDcOfOk3uG9SIWhYb1UufUQ4LrgsTAAXqRF5hR/8A/dsZR9/ijqFfHOgyN3X29cwld8= 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=3mVgnJyi; arc=none smtp.client-ip=209.85.219.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="3mVgnJyi" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e032d4cf26aso871977276.3 for ; Tue, 25 Jun 2024 10:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719336394; x=1719941194; 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=XrweehdAa2tkZxz5Zxp9wFN4gNwYxCO/FheTIJk34FQ=; b=3mVgnJyi80byeJuBxXAPD5QJ8vDBV0hh+0sSnb+uFWqRlPs3MWPD2Gz9YbFmVoEd20 OEzEiL/MQNBHDcRfT5YbceGhmvvdxeMitttJTeVAglnK14bsJHvyFFxLSWXcB96uXv9L /104T/0boftYvD7u2z5HtWdNNpNSkFJneFWPxa+BULOycyzhsD/9k+xJmxS9oVHKDWpW wVETBaHVV82WgynAoMcR15Ywohw2zHUu180NNZRZKacEUPDeRNYWZ01gMU65ZGBmdypg kGhzV3XwWvQ+GHTXvY3nLf4GV2dPOHevBkMzoHuK0Lf3Ltz4PXq6loeSpN0L7H2Um6JY k/oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719336394; x=1719941194; 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=XrweehdAa2tkZxz5Zxp9wFN4gNwYxCO/FheTIJk34FQ=; b=n84lNnheqlnfW+FX7lGbZIu7APnEPmJt9oCNfRoM9UD3sbxV7XlbSyCF8SWkZjUmyE vEHoxYJTUa2Da2coHbekRxFnKGP1hRVTZX1siENfDoPbdA+bADSJ2kcaPhbwfIh5fE+L sx9ng+cw6DbgGEeMA8xptBklcW6v7yweB0Vb9wuHSmoIfa+dLKTOH77ohNkk9SAtNwcH IPr1SdH+Wa5ufTmzr/1v405/oV/8sYXTllUxVin4ga5f3IE28ldFLDLMDmDwzDDdaBLB bqbt5fXEyZdWhuJqXpMgJBWJW9mxWTcXN8KrPbnMbyjktwdrYdGeytYYsBNQzQ5FcYmP sApg== X-Forwarded-Encrypted: i=1; AJvYcCWmMhflXtQN5m2pJgH6CgBoK3mjyoiQtA6ltJwqndcTxlc7p+tyB7bMU0OrsGoP5ryQrNhtmWy/L94pFdI1O030VGjVfweGLFKvAf3P X-Gm-Message-State: AOJu0Yx2lY06NxvijFNckOIQiZliwEYFOME/zDMCF3ZzMXnwXCcg3JSG WZDfj66vTnE+VqncrAUKV4pBgRl1aPKLigR53jXf6F4pRaiFFU43OIQSegMTh4P03uRhl2q7Ntk RvjwGVQ== X-Google-Smtp-Source: AGHT+IEUAqxicES2UtcaEb6UDQ+bDldZC47HTYRjmbObzHA40nFed+1pv/51vSijPeWYxPRv8nv6BqF9dCbq X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b4cb:a52b:f9ea:8678]) (user=irogers job=sendgmr) by 2002:a05:6902:2b0a:b0:dff:83e:b259 with SMTP id 3f1490d57ef6-e0304040464mr259080276.6.1719336394399; Tue, 25 Jun 2024 10:26:34 -0700 (PDT) Date: Tue, 25 Jun 2024 10:25:48 -0700 In-Reply-To: <20240625172603.900667-1-irogers@google.com> Message-Id: <20240625172603.900667-12-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 11/26] perf script: 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/builtin-script.c | 65 +++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 394bce9f5338..b4fc2971335b 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3899,38 +3899,7 @@ int cmd_script(int argc, const char **argv) const char *dlfilter_file =3D NULL; const char **__argv; int i, j, err =3D 0; - struct perf_script script =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, - .attr =3D process_attr, - .event_update =3D perf_event__process_event_update, -#ifdef HAVE_LIBTRACEEVENT - .tracing_data =3D perf_event__process_tracing_data, -#endif - .feature =3D process_feature_event, - .build_id =3D perf_event__process_build_id, - .id_index =3D perf_event__process_id_index, - .auxtrace_info =3D perf_script__process_auxtrace_info, - .auxtrace =3D perf_event__process_auxtrace, - .auxtrace_error =3D perf_event__process_auxtrace_error, - .stat =3D perf_event__process_stat_event, - .stat_round =3D process_stat_round_event, - .stat_config =3D process_stat_config_event, - .thread_map =3D process_thread_map_event, - .cpu_map =3D process_cpu_map_event, - .throttle =3D process_throttle_event, - .unthrottle =3D process_throttle_event, - .ordered_events =3D true, - .ordering_requires_timestamps =3D true, - }, - }; + struct perf_script script =3D {}; struct perf_data data =3D { .mode =3D PERF_DATA_MODE_READ, }; @@ -4102,10 +4071,8 @@ int cmd_script(int argc, const char **argv) data.path =3D input_name; data.force =3D symbol_conf.force; =20 - if (unsorted_dump) { + if (unsorted_dump) dump_trace =3D true; - script.tool.ordered_events =3D false; - } =20 if (symbol__validate_sym_arguments()) return -1; @@ -4296,6 +4263,34 @@ int cmd_script(int argc, const char **argv) use_browser =3D 0; } =20 + perf_tool__init(&script.tool, !unsorted_dump); + script.tool.sample =3D process_sample_event; + script.tool.mmap =3D perf_event__process_mmap; + script.tool.mmap2 =3D perf_event__process_mmap2; + script.tool.comm =3D perf_event__process_comm; + script.tool.namespaces =3D perf_event__process_namespaces; + script.tool.cgroup =3D perf_event__process_cgroup; + script.tool.exit =3D perf_event__process_exit; + script.tool.fork =3D perf_event__process_fork; + script.tool.attr =3D process_attr; + script.tool.event_update =3D perf_event__process_event_update; +#ifdef HAVE_LIBTRACEEVENT + script.tool.tracing_data =3D perf_event__process_tracing_data; +#endif + script.tool.feature =3D process_feature_event; + script.tool.build_id =3D perf_event__process_build_id; + script.tool.id_index =3D perf_event__process_id_index; + script.tool.auxtrace_info =3D perf_script__process_auxtrace_info; + script.tool.auxtrace =3D perf_event__process_auxtrace; + script.tool.auxtrace_error =3D perf_event__process_auxtrace_error; + script.tool.stat =3D perf_event__process_stat_event; + script.tool.stat_round =3D process_stat_round_event; + script.tool.stat_config =3D process_stat_config_event; + script.tool.thread_map =3D process_thread_map_event; + script.tool.cpu_map =3D process_cpu_map_event; + script.tool.throttle =3D process_throttle_event; + script.tool.unthrottle =3D process_throttle_event; + script.tool.ordering_requires_timestamps =3D true; session =3D perf_session__new(&data, &script.tool); if (IS_ERR(session)) return PTR_ERR(session); --=20 2.45.2.741.gdbec12cfda-goog