intel_pt_recording_options: Remove redundant intel_pt_evsel null check
PATCH 1/1 intel_pt_recording_options: Remove redundant intel_pt_evsel null check
intel_pt_evsel cannot be NULL here since its already being dereferenced above. Remove this redundant check.
--- tools/perf/arch/x86/util/intel-pt.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
tools/perf/arch/x86/util/intel-pt.c +11 -13
@@ -836,19 +836,17 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } } -if (intel_pt_evsel) { -/* -* To obtain the auxtrace buffer file descriptor, the auxtrace -* event must come first. -*/ -perf_evlist__to_front (evlist, intel_pt_evsel); -/* -* In the case of per-cpu mmaps, we need the CPU on the -* AUX event. -*/ -if (!perf_cpu_map__empty (cpus)) -evsel__set_sample_bit (intel_pt_evsel,CPU ); - } +/* +* To obtain the auxtrace buffer file descriptor, the auxtrace +* event must come first. +*/ +perf_evlist__to_front (evlist, intel_pt_evsel); +/* +* In the case of per-cpu mmaps, we need the CPU on the +* AUX event. +*/ +if (!perf_cpu_map__empty (cpus)) +evsel__set_sample_bit (intel_pt_evsel,CPU );/* Add dummy event to keep tracking */ if (opts->full_auxtrace) {
Signature · 1 line
2.17.1
Quoted 13 lines · Gaurav Singh
intel_pt_evselcannot be NULL here since its already being dereferenced above. Remove this redundant check.Signed-off-by Gaurav Singh <[email protected]>--- tools/perf/arch/x86/util/intel-pt.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)tools/perf/arch/x86/util/intel-pt.c +0
-0
tools/perf/arch/x86/util/intel-pt.c static int intel_pt_recording_options(struct auxtrace_record *itr, · line 838
Quoted 3 lines
tools/perf/arch/x86/util/intel-pt.c +0
-0@@ -836,19 +836,17 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } }
I wonder we sould put check before that above usage of intel_pt_evsel, because there's no check for that.. but yes, if intel_pt_evsel is NULL it will fail earlier.. Adrian?
thanks,
jirka
Quoted 30 lines
tools/perf/arch/x86/util/intel-pt.c +11
-13-if (intel_pt_evsel) { -/* -* To obtain the auxtrace buffer file descriptor, the auxtrace -* event must come first. -*/ -perf_evlist__to_front (evlist, intel_pt_evsel); -/* -* In the case of per-cpu mmaps, we need the CPU on the -* AUX event. -*/ -if (!perf_cpu_map__empty (cpus)) -evsel__set_sample_bit (intel_pt_evsel,CPU ); - } +/* +* To obtain the auxtrace buffer file descriptor, the auxtrace +* event must come first. +*/ +perf_evlist__to_front (evlist, intel_pt_evsel); +/* +* In the case of per-cpu mmaps, we need the CPU on the +* AUX event. +*/ +if (!perf_cpu_map__empty (cpus)) +evsel__set_sample_bit (intel_pt_evsel,CPU );/* Add dummy event to keep tracking */ if (opts->full_auxtrace) {Signature · 1 line
2.17.1
Adrian Hunter
reviewerQuoted 9 lines · Jiri Olsa
Quoted 8 lines · Gaurav Singh
intel_pt_evselcannot be NULL here since its already being dereferenced above. Remove this redundant check.Signed-off-by Gaurav Singh <[email protected]>--- tools/perf/arch/x86/util/intel-pt.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
Quoted 12 lines
tools/perf/arch/x86/util/intel-pt.c static int intel_pt_recording_options(struct auxtrace_record *itr, · line 838
Quoted 8 lines
tools/perf/arch/x86/util/intel-pt.c +0
-0@@ -836,19 +836,17 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } }I wonder we sould put check before that above usage of
intel_pt_evsel, because there's no check for that.. but yes, ifintel_pt_evselis NULL it will fail earlier.. Adrian?
The code was written when sampling-mode did not require an intel_pt_evsel. Now it does, so intel_pt_evsel will not be NULL. I think it is OK as is.
Quoted 35 lines
thanks,
jirkaQuoted 30 lines
tools/perf/arch/x86/util/intel-pt.c +11
-13-if (intel_pt_evsel) { -/* -* To obtain the auxtrace buffer file descriptor, the auxtrace -* event must come first. -*/ -perf_evlist__to_front (evlist, intel_pt_evsel); -/* -* In the case of per-cpu mmaps, we need the CPU on the -* AUX event. -*/ -if (!perf_cpu_map__empty (cpus)) -evsel__set_sample_bit (intel_pt_evsel,CPU ); - } +/* +* To obtain the auxtrace buffer file descriptor, the auxtrace +* event must come first. +*/ +perf_evlist__to_front (evlist, intel_pt_evsel); +/* +* In the case of per-cpu mmaps, we need the CPU on the +* AUX event. +*/ +if (!perf_cpu_map__empty (cpus)) +evsel__set_sample_bit (intel_pt_evsel,CPU );/* Add dummy event to keep tracking */ if (opts->full_auxtrace) {Signature · 1 line
2.17.1
Quoted 4 lines · Gaurav Singh
intel_pt_evselcannot be NULL here since its already being dereferenced above. Remove this redundant check.Signed-off-by Gaurav Singh <[email protected]>
Quoted 40 lines
--- tools/perf/arch/x86/util/intel-pt.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)tools/perf/arch/x86/util/intel-pt.c +11
-13@@ -836,19 +836,17 @@ static int intel_pt_recording_options(struct auxtrace_record *itr, } } -if (intel_pt_evsel) { -/* -* To obtain the auxtrace buffer file descriptor, the auxtrace -* event must come first. -*/ -perf_evlist__to_front (evlist, intel_pt_evsel); -/* -* In the case of per-cpu mmaps, we need the CPU on the -* AUX event. -*/ -if (!perf_cpu_map__empty (cpus)) -evsel__set_sample_bit (intel_pt_evsel,CPU ); - } +/* +* To obtain the auxtrace buffer file descriptor, the auxtrace +* event must come first. +*/ +perf_evlist__to_front (evlist, intel_pt_evsel); +/* +* In the case of per-cpu mmaps, we need the CPU on the +* AUX event. +*/ +if (!perf_cpu_map__empty (cpus)) +evsel__set_sample_bit (intel_pt_evsel,CPU );/* Add dummy event to keep tracking */ if (opts->full_auxtrace) {