Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / util.c

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index f7adf1203df14f3f1404c1198f99fe916c5d63c7..7acafb3c5592d60501561986b1812fb6b121f271 100644 (file)
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -34,6 +34,7 @@ bool test_attr__enabled;
 bool perf_host  = true;
 bool perf_guest = false;
 
+char tracing_path[PATH_MAX + 1]        = "/sys/kernel/debug/tracing";
 char tracing_events_path[PATH_MAX + 1] = "/sys/kernel/debug/tracing/events";
 
 void event_attr_init(struct perf_event_attr *attr)
@@ -391,6 +392,8 @@ void set_term_quiet_input(struct termios *old)
 
 static void set_tracing_events_path(const char *tracing, const char *mountpoint)
 {
+       snprintf(tracing_path, sizeof(tracing_path), "%s/%s",
+                mountpoint, tracing);
        snprintf(tracing_events_path, sizeof(tracing_events_path), "%s/%s%s",
                 mountpoint, tracing, "events");
 }
@@ -436,66 +439,14 @@ const char *perf_debugfs_mount(const char *mountpoint)
 
 void perf_debugfs_set_path(const char *mntpt)
 {
-       snprintf(debugfs_mountpoint, strlen(debugfs_mountpoint), "%s", mntpt);
        set_tracing_events_path("tracing/", mntpt);
 }
 
-static const char *find_tracefs(void)
-{
-       const char *path = __perf_tracefs_mount(NULL);
-
-       return path;
-}
-
-static const char *find_debugfs(void)
-{
-       const char *path = __perf_debugfs_mount(NULL);
-
-       if (!path)
-               fprintf(stderr, "Your kernel does not support the debugfs filesystem");
-
-       return path;
-}
-
-/*
- * Finds the path to the debugfs/tracing
- * Allocates the string and stores it.
- */
-const char *find_tracing_dir(void)
-{
-       const char *tracing_dir = "";
-       static char *tracing;
-       static int tracing_found;
-       const char *debugfs;
-
-       if (tracing_found)
-               return tracing;
-
-       debugfs = find_tracefs();
-       if (!debugfs) {
-               tracing_dir = "/tracing";
-               debugfs = find_debugfs();
-               if (!debugfs)
-                       return NULL;
-       }
-
-       if (asprintf(&tracing, "%s%s", debugfs, tracing_dir) < 0)
-               return NULL;
-
-       tracing_found = 1;
-       return tracing;
-}
-
 char *get_tracing_file(const char *name)
 {
-       const char *tracing;
        char *file;
 
-       tracing = find_tracing_dir();
-       if (!tracing)
-               return NULL;
-
-       if (asprintf(&file, "%s/%s", tracing, name) < 0)
+       if (asprintf(&file, "%s/%s", tracing_path, name) < 0)
                return NULL;
 
        return file;