From nobody Fri Oct 3 16:41:00 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 B132B3314A1 for ; Thu, 28 Aug 2025 16:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756398775; cv=none; b=bg4Pl1Iy4HmcoYw47kUnkRIe98xQPwRkphUK3pZWksiVjXggv0XDP23x6gDnK6Xoabr81LRGulZbipIHtY3ny/HQ0n3Anc24KdHZCI3sRCAhaHdY+dOqZ3bKKuw+km/ZGB8uIyBxYrQ/BzBDpax2jACz/hZAZnowWSMVC7uf9NU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756398775; c=relaxed/simple; bh=tzmw2oJ1J8Nlv7ewzHwz5IiTw7iVULUwfwHrsVrWjQI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=g9yZFuAjdUie5wjYWGrZmY5lBctx8CnasSs7RRJunn70J+pKNJ5/z/vbskC8z3eghIGstoGATZmVePYS2AoeaP7c6EKhTGfCsennqC1ZcPsxBq3fxZg8lO+tv8zkS8QK3D7tReuXVMUkvwbFYSX5GSP8Ykw5zcMG2tIKrMI85Cg= 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=0VTp0q05; arc=none smtp.client-ip=209.85.216.73 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="0VTp0q05" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-327594fd627so1127529a91.3 for ; Thu, 28 Aug 2025 09:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756398773; x=1757003573; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=o8gifwonm5nD53uhdwlbZ/djYkNx9hhdBbSGbpiNkeA=; b=0VTp0q05+chNnmIcQewAUZJD7tYIGp6QuZYhms14ggLJX8UrYON4HK71GIemvE/oni gWIeFIKskmlMlcJq1pOR3QIjFA/UAKY7S3C1f0x+XVGenu9XKYCdm2qOR+ZyGuhPomne IA3dMZhOxiUAYj3XKGOwfYBO4EYmiZjv1CneEQnTCQpFtHGdyvhaQzr9Nj/Qm+1Ga1Ak YZhSnY2kP/8DqLOGVP3NsWkZNkPzHy8ZEe9XWb0IRpKVyf8QYy4obarF2r0skRsv9M7s T0yHp9rAe4ShCh8IS+4eJKnN8echpLgeXjJPbYBHBd3tLLnFBZA3H4mjuDSlD8alWvN+ /h3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756398773; x=1757003573; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o8gifwonm5nD53uhdwlbZ/djYkNx9hhdBbSGbpiNkeA=; b=nZrp4TgH/duPhKLbLAhO+uTzGarJPNk4UrbhqfMVrrgZpHss7DpFDY8e6z+8abyr9M C9BTZez0GC7qvm8VEbvk8DFAEN97ZXHVzueFEfo/ZlTNLRcI/q6hcaCoJ4OZa55v6pGQ +3ICd/J5h3jUr1nFDne89GPKorinSkWu79BuQ+f3U7ygByt95QAb3M9EwbBmzotd/Acy sD5tDTPllA6x0OG/o2zbcuTDTtV+xY9H15CvK06AtMCNf+ncU2RwpqxAp4hkZAfz5K5f Z1puI3QNuvM+YjmBEuddEJzb5npB9SENP+dFEUUGoqAcrfcZqUEo+KKbUbyids7B7Y0D 5BCQ== X-Forwarded-Encrypted: i=1; AJvYcCWWpLPfA4VyKOYEhFjRebvIWbwoI81HBs/uu6nL1nJkjFgQRiH1tZ+LQjiyJZ7gyA0RjTyLyzRBkC9jhgs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8E2NmkW/G7VJrZH1COBoIEYkv5yNNpRR4kcc3tM4V7yFq+ISW bcFQAAsoRJyWls1z8NbtXa2n4rD9u0q016kqBPZOmIcnO0EYLjyKr6zDiwf1skitO2/JiRoJcpR 41BPs3qwWDg== X-Google-Smtp-Source: AGHT+IHNeZLB1gqDaEFwmRI+M7BZSjuo+UXCgJaWvSG5RHwxSKLQ+py07YVUyIH1D3TNI9TWywdHr2UmhvPS X-Received: from pjbov14.prod.google.com ([2002:a17:90b:258e:b0:324:eb0d:70e8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1649:b0:321:4182:2b9e with SMTP id 98e67ed59e1d1-32515e37410mr30626631a91.12.1756398772749; Thu, 28 Aug 2025 09:32:52 -0700 (PDT) Date: Thu, 28 Aug 2025 09:32:16 -0700 In-Reply-To: <20250828163225.3839073-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250828163225.3839073-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.268.g9569e192d0-goog Message-ID: <20250828163225.3839073-7-irogers@google.com> Subject: [PATCH v2 06/15] perf parse-events: Remove unused FILE input argument to scanner 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 , James Clark , Xu Yang , Thomas Falcon , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, Atish Patra , Beeman Strong , Leo Yan , Vince Weaver Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now the events file isn't directly parsed from a FILE but stored in a string prior to parsing, remove the FILE argument to the associated scanner functions as they only ever pass NULL. Signed-off-by: Ian Rogers --- tools/perf/arch/x86/util/intel-pt.c | 2 +- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/pmu.c | 3 +-- tools/perf/util/parse-events.c | 18 ++++++------------ tools/perf/util/parse-events.h | 3 +-- tools/perf/util/pmu.c | 6 +++--- 6 files changed, 13 insertions(+), 21 deletions(-) diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util= /intel-pt.c index add33cb5d1da..2d7c0dec86b0 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -72,7 +72,7 @@ static int intel_pt_parse_terms_with_default(const struct= perf_pmu *pmu, int err; =20 parse_events_terms__init(&terms); - err =3D parse_events_terms(&terms, str, /*input=3D*/ NULL); + err =3D parse_events_terms(&terms, str); if (err) goto out_free; =20 diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index bb8004397650..4e55b0d295bd 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -2556,7 +2556,7 @@ static int test_term(const struct terms_test *t) =20 =20 parse_events_terms__init(&terms); - ret =3D parse_events_terms(&terms, t->str, /*input=3D*/ NULL); + ret =3D parse_events_terms(&terms, t->str); if (ret) { pr_debug("failed to parse terms '%s', err %d\n", t->str , ret); diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c index 4a9f8e090cf4..cbded2c6faa4 100644 --- a/tools/perf/tests/pmu.c +++ b/tools/perf/tests/pmu.c @@ -169,8 +169,7 @@ static int test__pmu_format(struct test_suite *test __m= aybe_unused, int subtest parse_events_terms__init(&terms); if (parse_events_terms(&terms, "krava01=3D15,krava02=3D170,krava03=3D1,krava11=3D27,krava12=3D1," - "krava13=3D2,krava21=3D119,krava22=3D11,krava23=3D2", - NULL)) { + "krava13=3D2,krava21=3D119,krava22=3D11,krava23=3D2")) { pr_err("Term parsing failed\n"); goto err_out; } diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index cc677d9b2d5a..37aa392ddaf2 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1956,7 +1956,6 @@ int parse_events__set_default_name(struct list_head *= list, char *name) } =20 static int parse_events__scanner(const char *str, - FILE *input, struct parse_events_state *parse_state) { YY_BUFFER_STATE buffer; @@ -1967,10 +1966,7 @@ static int parse_events__scanner(const char *str, if (ret) return ret; =20 - if (str) - buffer =3D parse_events__scan_string(str, scanner); - else - parse_events_set_in(input, scanner); + buffer =3D parse_events__scan_string(str, scanner); =20 #ifdef PARSER_DEBUG parse_events_debug =3D 1; @@ -1978,10 +1974,8 @@ static int parse_events__scanner(const char *str, #endif ret =3D parse_events_parse(parse_state, scanner); =20 - if (str) { - parse_events__flush_buffer(buffer, scanner); - parse_events__delete_buffer(buffer, scanner); - } + parse_events__flush_buffer(buffer, scanner); + parse_events__delete_buffer(buffer, scanner); parse_events_lex_destroy(scanner); return ret; } @@ -1989,7 +1983,7 @@ static int parse_events__scanner(const char *str, /* * parse event config string, return a list of event terms. */ -int parse_events_terms(struct parse_events_terms *terms, const char *str, = FILE *input) +int parse_events_terms(struct parse_events_terms *terms, const char *str) { struct parse_events_state parse_state =3D { .terms =3D NULL, @@ -1997,7 +1991,7 @@ int parse_events_terms(struct parse_events_terms *ter= ms, const char *str, FILE * }; int ret; =20 - ret =3D parse_events__scanner(str, input, &parse_state); + ret =3D parse_events__scanner(str, &parse_state); if (!ret) list_splice(&parse_state.terms->terms, &terms->terms); =20 @@ -2302,7 +2296,7 @@ int __parse_events(struct evlist *evlist, const char = *str, const char *pmu_filte }; int ret, ret2; =20 - ret =3D parse_events__scanner(str, /*input=3D*/ NULL, &parse_state); + ret =3D parse_events__scanner(str, &parse_state); =20 if (!ret && list_empty(&parse_state.list)) { WARN_ONCE(true, "WARNING: event parser found nothing\n"); diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 34a5ec21d5e8..660303e591ad 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include =20 @@ -198,7 +197,7 @@ void parse_events_term__delete(struct parse_events_term= *term); void parse_events_terms__delete(struct parse_events_terms *terms); void parse_events_terms__init(struct parse_events_terms *terms); void parse_events_terms__exit(struct parse_events_terms *terms); -int parse_events_terms(struct parse_events_terms *terms, const char *str, = FILE *input); +int parse_events_terms(struct parse_events_terms *terms, const char *str); =20 struct parse_events_modifier { u8 precise; /* Number of repeated 'p' for precision. */ diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index ddcd4918832d..b44dfe4c73fc 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -777,7 +777,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias= , struct list_head *terms int ret; =20 parse_events_terms__init(&alias_terms); - ret =3D parse_events_terms(&alias_terms, alias->terms, /*input=3D*/NULL); + ret =3D parse_events_terms(&alias_terms, alias->terms); if (ret) { pr_err("Cannot parse '%s' terms '%s': %d\n", alias->name, alias->terms, ret); @@ -2045,7 +2045,7 @@ static char *format_alias(char *buf, int len, const s= truct perf_pmu *pmu, } =20 parse_events_terms__init(&terms); - ret =3D parse_events_terms(&terms, alias->terms, /*input=3D*/NULL); + ret =3D parse_events_terms(&terms, alias->terms); if (ret) { pr_err("Failure to parse '%s' terms '%s': %d\n", alias->name, alias->terms, ret); @@ -2602,7 +2602,7 @@ const char *perf_pmu__name_from_config(struct perf_pm= u *pmu, u64 config) int ret; =20 parse_events_terms__init(&terms); - ret =3D parse_events_terms(&terms, event->terms, /*input=3D*/NULL); + ret =3D parse_events_terms(&terms, event->terms); if (ret) { pr_debug("Failed to parse '%s' terms '%s': %d\n", event->name, event->terms, ret); --=20 2.51.0.268.g9569e192d0-goog