leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf pmu: Split perf_pmu__new_alias()

Browse Source 
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: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Sukadev Bhattiprolu 2015-06-10 00:25:08 -07:00 committed by Arnaldo Carvalho de Melo
parent c5de47f2e8
commit 70c646e0e4
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/perf/util/pmu.c
View File

@ -206,17 +206,12 @@ static int perf_pmu__parse_snapshot(struct perf_pmu_alias *alias,
return 0; 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; struct perf_pmu_alias *alias;
char buf[256];
int ret; int ret;
ret = fread(buf, 1, sizeof(buf), file);
if (ret == 0)
return -EINVAL;
buf[ret] = 0;
alias = malloc(sizeof(*alias)); alias = malloc(sizeof(*alias));
if (!alias) if (!alias)
return -ENOMEM; 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->unit[0] = '\0';
alias->per_pkg = false; alias->per_pkg = false;
ret = parse_events_terms(&alias->terms, buf); ret = parse_events_terms(&alias->terms, val);
if (ret) { if (ret) {
pr_err("Cannot parse alias %s: %d\n", val, ret);
free(alias); free(alias);
return ret; return ret;
} }
alias->name = strdup(name); alias->name = strdup(name);
if (dir) {
/* /*
* load unit name and scale if available * 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_scale(alias, dir, name);
perf_pmu__parse_per_pkg(alias, dir, name); perf_pmu__parse_per_pkg(alias, dir, name);
perf_pmu__parse_snapshot(alias, dir, name); perf_pmu__parse_snapshot(alias, dir, name);
}
list_add_tail(&alias->list, list); list_add_tail(&alias->list, list);
return 0; 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) static inline bool pmu_alias_info_file(char *name)
{ {
size_t len; size_t len;