diff options
| author | Wolfram Sang <wsa@kernel.org> | 2021-10-11 08:15:48 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2021-10-11 08:15:48 +0200 |
| commit | c5c34f5793f384ed2895584c6e2350b059c3f161 (patch) | |
| tree | 14a73568207fb3d38d7aa43439493ac8bc906bde /tools/perf/builtin-script.c | |
| parent | 669b2e4aa1a869def4dc207ea084fdd77366d646 (diff) | |
| parent | 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff) | |
Merge branch 'i2c/for-current' into i2c/for-mergewindow
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 0e824f7d8b19..6211d0b84b7a 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -368,16 +368,6 @@ static inline int output_type(unsigned int type) return OUTPUT_TYPE_OTHER; } -static inline unsigned int attr_type(unsigned int type) -{ - switch (type) { - case OUTPUT_TYPE_SYNTH: - return PERF_TYPE_SYNTH; - default: - return type; - } -} - static bool output_set_by_user(void) { int j; @@ -556,6 +546,18 @@ static void set_print_ip_opts(struct perf_event_attr *attr) output[type].print_ip_opts |= EVSEL__PRINT_SRCLINE; } +static struct evsel *find_first_output_type(struct evlist *evlist, + unsigned int type) +{ + struct evsel *evsel; + + evlist__for_each_entry(evlist, evsel) { + if (output_type(evsel->core.attr.type) == (int)type) + return evsel; + } + return NULL; +} + /* * verify all user requested events exist and the samples * have the expected data @@ -567,7 +569,7 @@ static int perf_session__check_output_opt(struct perf_session *session) struct evsel *evsel; for (j = 0; j < OUTPUT_TYPE_MAX; ++j) { - evsel = perf_session__find_first_evtype(session, attr_type(j)); + evsel = find_first_output_type(session->evlist, j); /* * even if fields is set to 0 (ie., show nothing) event must |