Commit 806731a9 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Do not pass NULL to parse_events() 



Many cases do not use the extra error information provided by
parse_events and instead pass NULL as the struct parse_events_error
pointer. Add a wrapper for those cases so that the pointer is never
NULL.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20220809080702.6921-4-adrian.hunter@intel.com


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

tools/perf/arch/arm/util/cs-etm.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ static int cs_etm_recording_options(struct auxtrace_record *itr, 
	if (opts->full_auxtrace) {

		struct evsel *tracking_evsel;



		err = parse_events(evlist, "dummy:u", NULL);

		err = parse_event(evlist, "dummy:u");

		if (err)

			goto out;

tools/perf/arch/arm64/util/arm-spe.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
		evsel__set_sample_bit(arm_spe_evsel, PHYS_ADDR);



	/* Add dummy event to keep tracking */

	err = parse_events(evlist, "dummy:u", NULL);

	err = parse_event(evlist, "dummy:u");

	if (err)

		return err;

tools/perf/arch/x86/tests/intel-cqm.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int test__intel_cqm_count_nmi_context(struct test_suite *test __maybe_unused, in 
		return TEST_FAIL;

	}



	ret = parse_events(evlist, "intel_cqm/llc_occupancy/", NULL);

	ret = parse_event(evlist, "intel_cqm/llc_occupancy/");

	if (ret) {

		pr_debug("parse_events failed, is \"intel_cqm/llc_occupancy/\" available?\n");

		err = TEST_SKIP;

tools/perf/arch/x86/util/intel-bts.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, 
		struct evsel *tracking_evsel;

		int err;



		err = parse_events(evlist, "dummy:u", NULL);

		err = parse_event(evlist, "dummy:u");

		if (err)

			return err;

tools/perf/arch/x86/util/intel-pt.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int intel_pt_track_switches(struct evlist *evlist) 
	if (!evlist__can_select_event(evlist, sched_switch))

		return -EPERM;



	err = parse_events(evlist, sched_switch, NULL);

	err = parse_event(evlist, sched_switch);

	if (err) {

		pr_debug2("%s: failed to parse %s, error %d\n",

			  __func__, sched_switch, err);