diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/util/pmu.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/util/pmu.c')
-rw-r--r-- | tools/perf/util/pmu.c | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index c232d8d..bc9d806 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -4,7 +4,7 @@ #include <unistd.h> #include <stdio.h> #include <dirent.h> -#include "fs.h" +#include "sysfs.h" #include "util.h" #include "pmu.h" #include "parse-events.h" @@ -77,8 +77,9 @@ static int pmu_format(const char *name, struct list_head *format) { struct stat st; char path[PATH_MAX]; - const char *sysfs = sysfs__mountpoint(); + const char *sysfs; + sysfs = sysfs_find_mountpoint(); if (!sysfs) return -1; @@ -165,8 +166,9 @@ static int pmu_aliases(const char *name, struct list_head *head) { struct stat st; char path[PATH_MAX]; - const char *sysfs = sysfs__mountpoint(); + const char *sysfs; + sysfs = sysfs_find_mountpoint(); if (!sysfs) return -1; @@ -210,10 +212,11 @@ static int pmu_type(const char *name, __u32 *type) { struct stat st; char path[PATH_MAX]; + const char *sysfs; FILE *file; int ret = 0; - const char *sysfs = sysfs__mountpoint(); + sysfs = sysfs_find_mountpoint(); if (!sysfs) return -1; @@ -238,10 +241,11 @@ static int pmu_type(const char *name, __u32 *type) static void pmu_read_sysfs(void) { char path[PATH_MAX]; + const char *sysfs; DIR *dir; struct dirent *dent; - const char *sysfs = sysfs__mountpoint(); + sysfs = sysfs_find_mountpoint(); if (!sysfs) return; @@ -266,10 +270,11 @@ static struct cpu_map *pmu_cpumask(const char *name) { struct stat st; char path[PATH_MAX]; + const char *sysfs; FILE *file; struct cpu_map *cpus; - const char *sysfs = sysfs__mountpoint(); + sysfs = sysfs_find_mountpoint(); if (!sysfs) return NULL; @@ -632,19 +637,3 @@ void print_pmu_events(const char *event_glob, bool name_only) printf("\n"); free(aliases); } - -bool pmu_have_event(const char *pname, const char *name) -{ - struct perf_pmu *pmu; - struct perf_pmu_alias *alias; - - pmu = NULL; - while ((pmu = perf_pmu__scan(pmu)) != NULL) { - if (strcmp(pname, pmu->name)) - continue; - list_for_each_entry(alias, &pmu->aliases, list) - if (!strcmp(alias->name, name)) - return true; - } - return false; -} |