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

Commit 70c646e0 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu: Split perf_pmu__new_alias() 



Separate the event parsing code in perf_pmu__new_alias() out into a
separate function __perf_pmu__new_alias() so that code can be called
indepdently.

This is based on an earlier patch from Andi Kleen.

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/1433921123-25327-5-git-send-email-sukadev@linux.vnet.ibm.com


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

tools/perf/util/pmu.c

+27 −15
Original line number Diff line number Diff line
@@ -206,17 +206,12 @@ static int perf_pmu__parse_snapshot(struct perf_pmu_alias *alias, 
	return 0;

}



static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FILE *file)

static int __perf_pmu__new_alias(struct list_head *list, char *dir, char *name,

				 char *desc __maybe_unused, char *val)

{

	struct perf_pmu_alias *alias;

	char buf[256];

	int ret;



	ret = fread(buf, 1, sizeof(buf), file);

	if (ret == 0)

		return -EINVAL;

	buf[ret] = 0;



	alias = malloc(sizeof(*alias));

	if (!alias)

		return -ENOMEM;
@@ -226,13 +221,15 @@ static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FI 
	alias->unit[0] = '\0';

	alias->per_pkg = false;



	ret = parse_events_terms(&alias->terms, buf);

	ret = parse_events_terms(&alias->terms, val);

	if (ret) {

		pr_err("Cannot parse alias %s: %d\n", val, ret);

		free(alias);

		return ret;

	}



	alias->name = strdup(name);

	if (dir) {

		/*

		 * load unit name and scale if available

		 */
@@ -240,12 +237,27 @@ static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FI 
		perf_pmu__parse_scale(alias, dir, name);

		perf_pmu__parse_per_pkg(alias, dir, name);

		perf_pmu__parse_snapshot(alias, dir, name);

	}



	list_add_tail(&alias->list, list);



	return 0;

}



static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FILE *file)

{

	char buf[256];

	int ret;



	ret = fread(buf, 1, sizeof(buf), file);

	if (ret == 0)

		return -EINVAL;



	buf[ret] = 0;



	return __perf_pmu__new_alias(list, dir, name, NULL, buf);

}



static inline bool pmu_alias_info_file(char *name)

{

	size_t len;