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

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

perf evsel: Reconstruct raw event with modifiers from perf_event_attr 



I forgot to add the modifiers to raw events too, fix it.

Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
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-pi267j1aqqjti9rqh9qy4g58@git.kernel.org


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

tools/perf/util/evsel.c

+7 −1
Original line number Diff line number Diff line
@@ -252,6 +252,12 @@ 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__raw_name(struct perf_evsel *evsel, char *bf, size_t size)

{

	int ret = scnprintf(bf, size, "raw 0x%" PRIx64, evsel->attr.config);

	return ret + perf_evsel__add_modifiers(evsel, bf + ret, size - ret);

}



const char *perf_evsel__name(struct perf_evsel *evsel)

{

	char bf[128];
@@ -261,7 +267,7 @@ const char *perf_evsel__name(struct perf_evsel *evsel) 


	switch (evsel->attr.type) {

	case PERF_TYPE_RAW:

		scnprintf(bf, sizeof(bf), "raw 0x%" PRIx64, evsel->attr.config);

		perf_evsel__raw_name(evsel, bf, sizeof(bf));

		break;



	case PERF_TYPE_HARDWARE: