perf parse: Provide a way to pass a fake_pmu to parse_events()

This is an alternative patch to what Jiri sent that instead of changing
all callers to parse_events() for allowing to pass a fake_pmu, provide
another function specifically for that.

From Jiri's patch:

This way it's possible to parse events from PMUs which are not present
in the system. It's available only for testing purposes coming in
following changes, so all the current users set fake_pmu argument as
false.

Based-on-a-patch-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lore.kernel.org/lkml/20200602214741.1218986-3-jolsa@kernel.org
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 4eb7bd53d048178c3a2f89aeea70a984803ed47b..c4906a6a9f1af635a66c0ab5bb1060c47c3b2e80 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2088,15 +2088,16 @@ int parse_events_terms(struct list_head *terms, const char *str)
        return ret;
 }
 
-int parse_events(struct evlist *evlist, const char *str,
-                struct parse_events_error *err)
+int __parse_events(struct evlist *evlist, const char *str,
+                  struct parse_events_error *err, struct perf_pmu *fake_pmu)
 {
        struct parse_events_state parse_state = {
-               .list   = LIST_HEAD_INIT(parse_state.list),
-               .idx    = evlist->core.nr_entries,
-               .error  = err,
-               .evlist = evlist,
-               .stoken = PE_START_EVENTS,
+               .list     = LIST_HEAD_INIT(parse_state.list),
+               .idx      = evlist->core.nr_entries,
+               .error    = err,
+               .evlist   = evlist,
+               .stoken   = PE_START_EVENTS,
+               .fake_pmu = fake_pmu,
        };
        int ret;
 

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index bf79e1eac7d9585ca3f1a9fd8c961036854e7391..f0010095fc8c2351776d6bcaf30fdad8825b22bd 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -33,8 +33,15 @@ const char *event_type(int type);
 
 int parse_events_option(const struct option *opt, const char *str, int unset);
 int parse_events_option_new_evlist(const struct option *opt, const char *str, int unset);
-int parse_events(struct evlist *evlist, const char *str,
-                struct parse_events_error *error);
+int __parse_events(struct evlist *evlist, const char *str, struct parse_events_error *error,
+                  struct perf_pmu *fake_pmu);
+
+static inline int parse_events(struct evlist *evlist, const char *str,
+                              struct parse_events_error *err)
+{
+       return __parse_events(evlist, str, err, NULL);
+}
+
 int parse_events_terms(struct list_head *terms, const char *str);
 int parse_filter(const struct option *opt, const char *str, int unset);
 int exclude_perf(const struct option *opt, const char *arg, int unset);