perf evsel: Rename perf_missing_features::bpf_event to ::bpf
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 74a1e863eb73dcc9f069b671dfb40650f3832116 Gitweb: https://git.kernel.org/tip/74a1e863eb73dcc9f069b671dfb40650f3832116 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 26 Aug 2019 19:31:06 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Mon, 26 Aug 2019 19:39:11 -03:00
perf evsel: Rename perf_missing_features::bpf_event to ::bpf
No need for that _event suffix, do just like all the other meta events and do away with that.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Song Liu <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/evsel.c | 9 ++++----- tools/perf/util/evsel.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-)
tools/perf/util/evsel.c +4 -5
@@ -1072,8 +1072,7 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, attr->mmap2 = track && !perf_missing_features.mmap2; attr->comm = track; attr->ksymbol = track && !perf_missing_features.ksymbol; - attr->bpf_event = track && !opts->no_bpf_event && - !perf_missing_features.bpf_event; + attr->bpf_event = track && !opts->no_bpf_event && !perf_missing_features.bpf;if (opts->record_namespaces) attr->namespaces = track;
@@ -1803,7 +1802,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, evsel->core.attr.read_format &= ~(PERF_FORMAT_GROUP |PERF_FORMAT_ID );if (perf_missing_features.ksymbol) evsel->core.attr.ksymbol =0 ; -if (perf_missing_features.bpf_event) +if (perf_missing_features.bpf) evsel->core.attr.bpf_event =0 ; retry_sample_id:if (perf_missing_features.sample_id_all)
@@ -1920,8 +1919,8 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, perf_missing_features.aux_output = true;pr_debug2 ("Kernel has no attr.aux_output support, bailing out\n" ); goto out_close; - }else if (!perf_missing_features.bpf_event && evsel->core.attr.bpf_event) { - perf_missing_features.bpf_event = true; + }else if (!perf_missing_features.bpf && evsel->core.attr.bpf_event) { + perf_missing_features.bpf = true;pr_debug2 ("switching off bpf_event\n" ); goto fallback_missing_features; }else if (!perf_missing_features.ksymbol && evsel->core.attr.ksymbol) {
tools/perf/util/evsel.h +1 -1
@@ -194,7 +194,7 @@ struct perf_missing_features {bool write_backward;bool group_read;bool ksymbol; -bool bpf_event; +bool bpf;bool aux_output; };