Commit 0c24d6fb authored by Thomas Richter's avatar Thomas Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf alias: Rebuild alias expression string to make it comparable 



PMU alias definitions in sysfs files may have spaces, newlines and
numbers with leading zeroes. Some alias definitions may also appear in
JSON files without spaces, etc.

Scan alias definitions and remove leading zeroes, spaces, newlines, etc
and rebuild string to make alias->str member comparable.

s390 for example  has terms specified as event=0x0091 (read from files
../<PMU>/events/<FILE> and terms specified as event=0x91 (read from JSON
files).

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Reviewed-by: default avatarHendrik Brueckner <brueckner@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Link: http://lkml.kernel.org/r/20180615101105.47047-2-tmricht@linux.ibm.com


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

tools/perf/util/pmu.c

+24 −1
Original line number Diff line number Diff line
@@ -241,9 +241,11 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
				 char *metric_expr,

				 char *metric_name)

{

	struct parse_events_term *term;

	struct perf_pmu_alias *alias;

	int ret;

	int num;

	char newval[256];



	alias = malloc(sizeof(*alias));

	if (!alias)
@@ -262,6 +264,27 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
		return ret;

	}



	/* Scan event and remove leading zeroes, spaces, newlines, some

	 * platforms have terms specified as

	 * event=0x0091 (read from files ../<PMU>/events/<FILE>

	 * and terms specified as event=0x91 (read from JSON files).

	 *

	 * Rebuild string to make alias->str member comparable.

	 */

	memset(newval, 0, sizeof(newval));

	ret = 0;

	list_for_each_entry(term, &alias->terms, list) {

		if (ret)

			ret += scnprintf(newval + ret, sizeof(newval) - ret,

					 ",");

		if (term->type_val == PARSE_EVENTS__TERM_TYPE_NUM)

			ret += scnprintf(newval + ret, sizeof(newval) - ret,

					 "%s=%#x", term->config, term->val.num);

		else if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR)

			ret += scnprintf(newval + ret, sizeof(newval) - ret,

					 "%s=%s", term->config, term->val.str);

	}



	alias->name = strdup(name);

	if (dir) {

		/*
@@ -285,7 +308,7 @@ static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name, 
		snprintf(alias->unit, sizeof(alias->unit), "%s", unit);

	}

	alias->per_pkg = perpkg && sscanf(perpkg, "%d", &num) == 1 && num == 1;

	alias->str = strdup(val);

	alias->str = strdup(newval);



	list_add_tail(&alias->list, list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE