Commit 74a1e863 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Song Liu <songliubraving@fb.com>
Link: https://lkml.kernel.org/n/tip-bvc83f380dva83wlg52yd10t@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3f604b5f

tools/perf/util/evsel.c

+4 −5
Original line number Diff line number Diff line
@@ -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 @@ fallback_missing_features: 
		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 @@ try_fallback: 
		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
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct perf_missing_features { 
	bool write_backward;

	bool group_read;

	bool ksymbol;

	bool bpf_event;

	bool bpf;

	bool aux_output;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE