Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0565132 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Enable type checking for perf_evsel_config_term types 



Use a typed enum for the perf_evsel_config_term type enum.  This allows
gcc to do much stronger type checks, and also check for missing case
statements.

I removed the unused _MAX member from the number.

It found one missing case. I'm not sure it's a real problem, so I just
turned it into a BUG_ON for now.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20171020202755.21410-1-andi@firstfloor.org


[ Renamed the enum name to term_type as per jolsa's request ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c2f1cead

tools/perf/util/evsel.c

+2 −0
Original line number Diff line number Diff line
@@ -779,6 +779,8 @@ static void apply_config_terms(struct perf_evsel *evsel, 
		case PERF_EVSEL__CONFIG_TERM_OVERWRITE:

			attr->write_backward = term->val.overwrite ? 1 : 0;

			break;

		case PERF_EVSEL__CONFIG_TERM_DRV_CFG:

			BUG_ON(1);

		default:

			break;

		}

tools/perf/util/evsel.h

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct cgroup_sel; 
 * It is allocated within event parsing and attached to

 * perf_evsel::config_terms list head.

*/

enum {

enum term_type {

	PERF_EVSEL__CONFIG_TERM_PERIOD,

	PERF_EVSEL__CONFIG_TERM_FREQ,

	PERF_EVSEL__CONFIG_TERM_TIME,
@@ -49,12 +49,11 @@ enum { 
	PERF_EVSEL__CONFIG_TERM_OVERWRITE,

	PERF_EVSEL__CONFIG_TERM_DRV_CFG,

	PERF_EVSEL__CONFIG_TERM_BRANCH,

	PERF_EVSEL__CONFIG_TERM_MAX,

};



struct perf_evsel_config_term {

	struct list_head	list;

	int	type;

	enum term_type	type;

	union {

		u64	period;

		u64	freq;