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

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

perf evsel: Carve out event modifier formatting 

From perf_evsel__hw_name, so that we can use it for the other kinds of
events (tracepoints, software, hw cache, etc).

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-9gmd5wewsrvtny8tzxjfp471@git.kernel.org


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

tools/perf/util/evsel.c

+11 −6
Original line number Diff line number Diff line
@@ -86,16 +86,15 @@ const char *__perf_evsel__hw_name(u64 config) 
	return "unknown-hardware";

}



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

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

{

	int colon = 0;

	int colon = 0, r = 0;

	struct perf_event_attr *attr = &evsel->attr;

	int r = scnprintf(bf, size, "%s", __perf_evsel__hw_name(attr->config));

	bool exclude_guest_default = false;



#define MOD_PRINT(context, mod)	do {					\

		if (!attr->exclude_##context) {				\

			if (!colon) colon = r++;			\

			if (!colon) colon = ++r;			\

			r += scnprintf(bf + r, size - r, "%c", mod);	\

		} } while(0)
@@ -108,7 +107,7 @@ static int perf_evsel__hw_name(struct perf_evsel *evsel, char *bf, size_t size) 


	if (attr->precise_ip) {

		if (!colon)

			colon = r++;

			colon = ++r;

		r += scnprintf(bf + r, size - r, "%.*s", attr->precise_ip, "ppp");

		exclude_guest_default = true;

	}
@@ -119,10 +118,16 @@ static int perf_evsel__hw_name(struct perf_evsel *evsel, char *bf, size_t size) 
	}

#undef MOD_PRINT

	if (colon)

		bf[colon] = ':';

		bf[colon - 1] = ':';

	return r;

}



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

{

	int r = scnprintf(bf, size, "%s", __perf_evsel__hw_name(evsel->attr.config));

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

}



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

{

	int ret;