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

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

perf evsel: Handle all event types in perf_evsel__name 

Now to convert all event_name users to perf_evsel__name.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-buuz0j0gynseglxa76r01rdn@git.kernel.org


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

tools/perf/util/evsel.c

+11 −13
Original line number Diff line number Diff line
@@ -252,6 +252,11 @@ static int perf_evsel__hw_cache_name(struct perf_evsel *evsel, char *bf, size_t 
	return ret + perf_evsel__add_modifiers(evsel, bf + ret, size - ret);

}



static int perf_evsel__tracepoint_name(struct perf_evsel *evsel, char *bf, size_t size)

{

	return scnprintf(bf, size, "%s", evsel->name ?: "unknown tracepoint");

}



int perf_evsel__name(struct perf_evsel *evsel, char *bf, size_t size)

{

	int ret;
@@ -273,20 +278,13 @@ int perf_evsel__name(struct perf_evsel *evsel, char *bf, size_t size) 
		ret = perf_evsel__sw_name(evsel, bf, size);

		break;



	case PERF_TYPE_TRACEPOINT:

		ret = perf_evsel__tracepoint_name(evsel, bf, size);

		break;



	default:

		/*

		 * FIXME

 		 *

		 * This is the minimal perf_evsel__name so that we can

		 * reconstruct event names taking into account event modifiers.

		 *

		 * The old event_name uses it now for raw anr hw events, so that

		 * we don't drag all the parsing stuff into the python binding.

		 *

		 * On the next devel cycle the rest of the event naming will be

		 * brought here.

 		 */

		return 0;

		ret = scnprintf(bf, size, "%s", "unknown attr type");

		break;

	}



	return ret;

tools/perf/util/parse-events.c

+3 −18
Original line number Diff line number Diff line
@@ -203,26 +203,11 @@ const char *event_type(int type) 


const char *event_name(struct perf_evsel *evsel)

{

	u64 config = evsel->attr.config;

	int type = evsel->attr.type;



	if (type == PERF_TYPE_RAW || type == PERF_TYPE_HARDWARE ||

	    type == PERF_TYPE_SOFTWARE || type == PERF_TYPE_HW_CACHE) {

		/*

 		 * XXX minimal fix, see comment on perf_evsen__name, this static buffer

 		 * will go away together with event_name in the next devel cycle.

 		 */

	static char bf[128];

	perf_evsel__name(evsel, bf, sizeof(bf));

	return bf;

}



	if (evsel->name)

		return evsel->name;



	return __event_name(type, config);

}



const char *__event_name(int type, u64 config)

{

	static char buf[32];