perf parse-events: Remove unused FILE input argument to scanner

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.

Tested-by: Thomas Richter <tmricht@linux.ibm.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: James Clark <james.clark@linaro.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index add33cb5d1da8e76a94c2ccab7268a4b5754996f..2d7c0dec86b073eca854c2eb2e648e95d0cb2769 100644 (file)
--- 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;
 
        parse_events_terms__init(&terms);
-       err = parse_events_terms(&terms, str, /*input=*/ NULL);
+       err = parse_events_terms(&terms, str);
        if (err)
                goto out_free;
 

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 67550cc60555ddf1fdfe8a145e4f820635368960..13c1e4c45ea203aa4fe9fe5cfccfd98eb11ffaa4 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -2610,7 +2610,7 @@ static int test_term(const struct terms_test *t)
 
 
        parse_events_terms__init(&terms);
-       ret = parse_events_terms(&terms, t->str, /*input=*/ NULL);
+       ret = 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 4a9f8e090cf4b323c7c7f0b1bc69b6a4915a8136..cbded2c6faa4d5b422936e81bde83bc328fcdfe7 100644 (file)
--- 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 __maybe_unused, int subtest
        parse_events_terms__init(&terms);
        if (parse_events_terms(&terms,
                                "krava01=15,krava02=170,krava03=1,krava11=27,krava12=1,"
-                               "krava13=2,krava21=119,krava22=11,krava23=2",
-                               NULL)) {
+                               "krava13=2,krava21=119,krava22=11,krava23=2")) {
                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 8f320d08cf1f4c6af77455e470a5695807aa779c..e0f18e9c80002e99a9f26eb71d1be6d435fc4613 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1984,7 +1984,6 @@ int parse_events__set_default_name(struct list_head *list, char *name)
 }
 
 static int parse_events__scanner(const char *str,
-                                FILE *input,
                                 struct parse_events_state *parse_state)
 {
        YY_BUFFER_STATE buffer;
@@ -1995,10 +1994,7 @@ static int parse_events__scanner(const char *str,
        if (ret)
                return ret;
 
-       if (str)
-               buffer = parse_events__scan_string(str, scanner);
-       else
-               parse_events_set_in(input, scanner);
+       buffer = parse_events__scan_string(str, scanner);
 
 #ifdef PARSER_DEBUG
        parse_events_debug = 1;
@@ -2006,10 +2002,8 @@ static int parse_events__scanner(const char *str,
 #endif
        ret = parse_events_parse(parse_state, scanner);
 
-       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;
 }
@@ -2017,7 +2011,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 = {
                .terms  = NULL,
@@ -2025,7 +2019,7 @@ int parse_events_terms(struct parse_events_terms *terms, const char *str, FILE *
        };
        int ret;
 
-       ret = parse_events__scanner(str, input, &parse_state);
+       ret = parse_events__scanner(str, &parse_state);
        if (!ret)
                list_splice(&parse_state.terms->terms, &terms->terms);
 
@@ -2329,7 +2323,7 @@ int __parse_events(struct evlist *evlist, const char *str, const char *pmu_filte
        };
        int ret, ret2;
 
-       ret = parse_events__scanner(str, /*input=*/ NULL, &parse_state);
+       ret = parse_events__scanner(str, &parse_state);
 
        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 ed7b735911396977197a9efde1f8a0ac8de2c86a..3052a48978f8b42c4e868499e60e6b48b87629ef 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -9,7 +9,6 @@
 #include <stdbool.h>
 #include <linux/types.h>
 #include <linux/perf_event.h>
-#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 
@@ -199,7 +198,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);
 
 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 102fabfbf1d54c821c5cc82e63a998180b0481ea..876e87708b03a56810b79624275d63a7a3bf0d2a 100644 (file)
--- 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;
 
        parse_events_terms__init(&alias_terms);
-       ret = parse_events_terms(&alias_terms, alias->terms, /*input=*/NULL);
+       ret = parse_events_terms(&alias_terms, alias->terms);
        if (ret) {
                pr_err("Cannot parse '%s' terms '%s': %d\n",
                       alias->name, alias->terms, ret);
@@ -2046,7 +2046,7 @@ static char *format_alias(char *buf, int len, const struct perf_pmu *pmu,
        }
 
        parse_events_terms__init(&terms);
-       ret = parse_events_terms(&terms, alias->terms, /*input=*/NULL);
+       ret = parse_events_terms(&terms, alias->terms);
        if (ret) {
                pr_err("Failure to parse '%s' terms '%s': %d\n",
                        alias->name, alias->terms, ret);
@@ -2603,7 +2603,7 @@ const char *perf_pmu__name_from_config(struct perf_pmu *pmu, u64 config)
                int ret;
 
                parse_events_terms__init(&terms);
-               ret = parse_events_terms(&terms, event->terms, /*input=*/NULL);
+               ret = parse_events_terms(&terms, event->terms);
                if (ret) {
                        pr_debug("Failed to parse '%s' terms '%s': %d\n",
                                event->name, event->terms, ret);