Merge remote-tracking branch 'regulator/fix/fixed' into regulator-linus

[~andy/linux] / tools / perf / util / pmu.c

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index bc9d8069d37637835758d02e13ec3bc751d0f5e3..c232d8dd410bf6483ba8fcd850380bbd562f03ee 100644 (file)
--- 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 "sysfs.h"
+#include "fs.h"
 #include "util.h"
 #include "pmu.h"
 #include "parse-events.h"
@@ -77,9 +77,8 @@ static int pmu_format(const char *name, struct list_head *format)
 {
        struct stat st;
        char path[PATH_MAX];
-       const char *sysfs;
+       const char *sysfs = sysfs__mountpoint();
 
-       sysfs = sysfs_find_mountpoint();
        if (!sysfs)
                return -1;
 
@@ -166,9 +165,8 @@ static int pmu_aliases(const char *name, struct list_head *head)
 {
        struct stat st;
        char path[PATH_MAX];
-       const char *sysfs;
+       const char *sysfs = sysfs__mountpoint();
 
-       sysfs = sysfs_find_mountpoint();
        if (!sysfs)
                return -1;
 
@@ -212,11 +210,10 @@ 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;
 
@@ -241,11 +238,10 @@ 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;
 
@@ -270,11 +266,10 @@ 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;
 
@@ -637,3 +632,19 @@ 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;
+}