Commit ff47d86a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

libperf: Add perf_evlist__read_format() function

Add the perf_evlist__read_format() function to libperf as internal
function.
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-30-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 515dbe48
...@@ -161,3 +161,10 @@ void perf_evlist__disable(struct perf_evlist *evlist) ...@@ -161,3 +161,10 @@ void perf_evlist__disable(struct perf_evlist *evlist)
perf_evlist__for_each_entry(evlist, evsel) perf_evlist__for_each_entry(evlist, evsel)
perf_evsel__disable(evsel); perf_evsel__disable(evsel);
} }
u64 perf_evlist__read_format(struct perf_evlist *evlist)
{
struct perf_evsel *first = perf_evlist__first(evlist);
return first->attr.read_format;
}
...@@ -66,4 +66,6 @@ static inline struct perf_evsel *perf_evlist__last(struct perf_evlist *evlist) ...@@ -66,4 +66,6 @@ static inline struct perf_evsel *perf_evlist__last(struct perf_evlist *evlist)
return list_entry(evlist->entries.prev, struct perf_evsel, node); return list_entry(evlist->entries.prev, struct perf_evsel, node);
} }
u64 perf_evlist__read_format(struct perf_evlist *evlist);
#endif /* __LIBPERF_INTERNAL_EVLIST_H */ #endif /* __LIBPERF_INTERNAL_EVLIST_H */
...@@ -503,7 +503,7 @@ int perf_evlist__id_add_fd(struct evlist *evlist, ...@@ -503,7 +503,7 @@ int perf_evlist__id_add_fd(struct evlist *evlist,
* This way does not work with group format read, so bail * This way does not work with group format read, so bail
* out in that case. * out in that case.
*/ */
if (perf_evlist__read_format(evlist) & PERF_FORMAT_GROUP) if (perf_evlist__read_format(&evlist->core) & PERF_FORMAT_GROUP)
return -1; return -1;
if (!(evsel->core.attr.read_format & PERF_FORMAT_ID) || if (!(evsel->core.attr.read_format & PERF_FORMAT_ID) ||
...@@ -1240,12 +1240,6 @@ bool perf_evlist__valid_read_format(struct evlist *evlist) ...@@ -1240,12 +1240,6 @@ bool perf_evlist__valid_read_format(struct evlist *evlist)
return true; return true;
} }
u64 perf_evlist__read_format(struct evlist *evlist)
{
struct evsel *first = evlist__first(evlist);
return first->core.attr.read_format;
}
u16 perf_evlist__id_hdr_size(struct evlist *evlist) u16 perf_evlist__id_hdr_size(struct evlist *evlist)
{ {
struct evsel *first = evlist__first(evlist); struct evsel *first = evlist__first(evlist);
......
...@@ -217,7 +217,6 @@ int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel); ...@@ -217,7 +217,6 @@ int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);
void __perf_evlist__set_leader(struct list_head *list); void __perf_evlist__set_leader(struct list_head *list);
void perf_evlist__set_leader(struct evlist *evlist); void perf_evlist__set_leader(struct evlist *evlist);
u64 perf_evlist__read_format(struct evlist *evlist);
u64 __perf_evlist__combined_sample_type(struct evlist *evlist); u64 __perf_evlist__combined_sample_type(struct evlist *evlist);
u64 perf_evlist__combined_sample_type(struct evlist *evlist); u64 perf_evlist__combined_sample_type(struct evlist *evlist);
u64 perf_evlist__combined_branch_type(struct evlist *evlist); u64 perf_evlist__combined_branch_type(struct evlist *evlist);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment