Commit 79932d16 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Add tool event helpers 



Convert to and from a string. Fix evsel__tool_name() as array is
off-by-1.  Support more than just duration_time as a metric-id.

Fixes: 75eafc97 ("perf list: Print all available tool events")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220507053410.3798748-4-irogers@google.com


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

tools/perf/util/evsel.c

+31 −10
Original line number Diff line number Diff line
@@ -59,6 +59,33 @@ struct perf_missing_features perf_missing_features; 


static clockid_t clockid;



static const char *const perf_tool_event__tool_names[PERF_TOOL_MAX] = {

	NULL,

	"duration_time",

	"user_time",

	"system_time",

};



const char *perf_tool_event__to_str(enum perf_tool_event ev)

{

	if (ev > PERF_TOOL_NONE && ev < PERF_TOOL_MAX)

		return perf_tool_event__tool_names[ev];



	return NULL;

}



enum perf_tool_event perf_tool_event__from_str(const char *str)

{

	int i;



	perf_tool_event__for_each_event(i) {

		if (!strcmp(str, perf_tool_event__tool_names[i]))

			return i;

	}

	return PERF_TOOL_NONE;

}





static int evsel__no_extra_init(struct evsel *evsel __maybe_unused)

{

	return 0;
@@ -597,15 +624,9 @@ static int evsel__sw_name(struct evsel *evsel, char *bf, size_t size) 
	return r + evsel__add_modifiers(evsel, bf + r, size - r);

}



static const char *const evsel__tool_names[PERF_TOOL_MAX] = {

	"duration_time",

	"user_time",

	"system_time",

};



static int evsel__tool_name(enum perf_tool_event ev, char *bf, size_t size)

{

	return scnprintf(bf, size, "%s", evsel__tool_names[ev]);

	return scnprintf(bf, size, "%s", perf_tool_event__to_str(ev));

}



static int __evsel__bp_name(char *bf, size_t size, u64 addr, u64 type)
@@ -758,7 +779,7 @@ const char *evsel__name(struct evsel *evsel) 
		break;



	case PERF_TYPE_SOFTWARE:

		if (evsel->tool_event)

		if (evsel__is_tool(evsel))

			evsel__tool_name(evsel->tool_event, bf, sizeof(bf));

		else

			evsel__sw_name(evsel, bf, sizeof(bf));
@@ -791,8 +812,8 @@ const char *evsel__metric_id(const struct evsel *evsel) 
	if (evsel->metric_id)

		return evsel->metric_id;



	if (evsel->core.attr.type == PERF_TYPE_SOFTWARE && evsel->tool_event)

		return "duration_time";

	if (evsel__is_tool(evsel))

		return perf_tool_event__to_str(evsel->tool_event);



	return "unknown";

}

tools/perf/util/evsel.h

+11 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ enum perf_tool_event { 
	PERF_TOOL_MAX,

};



const char *perf_tool_event__to_str(enum perf_tool_event ev);

enum perf_tool_event perf_tool_event__from_str(const char *str);



#define perf_tool_event__for_each_event(ev)		\

	for ((ev) = PERF_TOOL_DURATION_TIME; (ev) < PERF_TOOL_MAX; ev++)



/** struct evsel - event selector

 *

 * @evlist - evlist this evsel is in, if it is in one.
@@ -269,6 +275,11 @@ int __evsel__hw_cache_type_op_res_name(u8 type, u8 op, u8 result, char *bf, size 
const char *evsel__name(struct evsel *evsel);

const char *evsel__metric_id(const struct evsel *evsel);



static inline bool evsel__is_tool(const struct evsel *evsel)

{

	return evsel->tool_event != PERF_TOOL_NONE;

}



const char *evsel__group_name(struct evsel *evsel);

int evsel__group_desc(struct evsel *evsel, char *buf, size_t size);