perf parse-events: Separate YYABORT and YYNOMEM cases

Split cases in event_pmu for greater accuracy.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: bpf@vger.kernel.org
Link: https://lore.kernel.org/r/20230627181030.95608-8-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 3ee351768433e0559fc18348c35c986f6aea7c85..d22866b97b76195b1efd0d21cb2953a6927720a0 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -283,37 +283,42 @@ event_pmu:
 PE_NAME opt_pmu_config
 {
        struct parse_events_state *parse_state = _parse_state;
-       struct parse_events_error *error = parse_state->error;
        struct list_head *list = NULL, *orig_terms = NULL, *terms= NULL;
+       struct parse_events_error *error = parse_state->error;
        char *pattern = NULL;
 
-#define CLEANUP_YYABORT                                        \
+#define CLEANUP                                                \
        do {                                            \
                parse_events_terms__delete($2);         \
                parse_events_terms__delete(orig_terms); \
                free(list);                             \
                free($1);                               \
                free(pattern);                          \
-               YYABORT;                                \
        } while(0)
 
-       if (parse_events_copy_term_list($2, &orig_terms))
-               CLEANUP_YYABORT;
-
        if (error)
                error->idx = @1.first_column;
 
+       if (parse_events_copy_term_list($2, &orig_terms)) {
+               CLEANUP;
+               YYNOMEM;
+       }
+
        list = alloc_list();
-       if (!list)
-               CLEANUP_YYABORT;
+       if (!list) {
+               CLEANUP;
+               YYNOMEM;
+       }
        /* Attempt to add to list assuming $1 is a PMU name. */
        if (parse_events_add_pmu(parse_state, list, $1, $2, /*auto_merge_stats=*/false)) {
                struct perf_pmu *pmu = NULL;
                int ok = 0;
 
                /* Failure to add, try wildcard expansion of $1 as a PMU name. */
-               if (asprintf(&pattern, "%s*", $1) < 0)
-                       CLEANUP_YYABORT;
+               if (asprintf(&pattern, "%s*", $1) < 0) {
+                       CLEANUP;
+                       YYNOMEM;
+               }
 
                while ((pmu = perf_pmus__scan(pmu)) != NULL) {
                        char *name = pmu->name;
@@ -328,8 +333,10 @@ PE_NAME opt_pmu_config
                            !perf_pmu__match(pattern, pmu->alias_name, $1)) {
                                bool auto_merge_stats = perf_pmu__auto_merge_stats(pmu);
 
-                               if (parse_events_copy_term_list(orig_terms, &terms))
-                                       CLEANUP_YYABORT;
+                               if (parse_events_copy_term_list(orig_terms, &terms)) {
+                                       CLEANUP;
+                                       YYNOMEM;
+                               }
                                if (!parse_events_add_pmu(parse_state, list, pmu->name, terms,
                                                          auto_merge_stats)) {
                                        ok++;
@@ -345,15 +352,15 @@ PE_NAME opt_pmu_config
                        ok = !parse_events_multi_pmu_add(parse_state, $1, $2, &list);
                        $2 = NULL;
                }
-               if (!ok)
-                       CLEANUP_YYABORT;
+               if (!ok) {
+                       CLEANUP;
+                       YYABORT;
+               }
        }
-       parse_events_terms__delete($2);
-       parse_events_terms__delete(orig_terms);
-       free(pattern);
-       free($1);
        $$ = list;
-#undef CLEANUP_YYABORT
+       list = NULL;
+       CLEANUP;
+#undef CLEANUP
 }
 |
 PE_NAME sep_dc