aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2009-12-28 16:48:30 +0800
committerIngo Molnar <mingo@elte.hu>2009-12-28 10:36:36 +0100
commit61be3e59ba7a6dbd39f92fd1f107285a0caeb008 (patch)
treeabccb9ea4c97ff2ea32a32337d172cb0b41e2ade /tools
parent29c52aa2300173dd45df04dae1f5acc81a2c93b1 (diff)
perf trace: Clean up find_debugfs()
Remove redundant code for 'perf trace' Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Clark Williams <williams@redhat.com> Cc: John Kacur <jkacur@redhat.com> LKML-Reference: <4B3870DE.7090500@cn.fujitsu.com> [ v2: resolved conflicts with recent changes ] Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/debugfs.c1
-rw-r--r--tools/perf/util/trace-event-info.c29
2 files changed, 6 insertions, 24 deletions
diff --git a/tools/perf/util/debugfs.c b/tools/perf/util/debugfs.c
index 1f805fde5fd..a88fefc0cc0 100644
--- a/tools/perf/util/debugfs.c
+++ b/tools/perf/util/debugfs.c
@@ -130,6 +130,7 @@ char *debugfs_mount(const char *mountpoint)
/* save the mountpoint */
strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
+ debugfs_found = 1;
return debugfs_mountpoint;
}
diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index dfef238ce15..535176dc95b 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -38,6 +38,7 @@
#include "../perf.h"
#include "trace-event.h"
+#include "debugfs.h"
#define VERSION "0.5"
@@ -102,32 +103,12 @@ void *malloc_or_die(unsigned int size)
static const char *find_debugfs(void)
{
- static char debugfs[MAX_PATH+1];
- static int debugfs_found;
- FILE *fp;
- struct mntent *m;
-
- if (debugfs_found)
- return debugfs;
-
- fp = setmntent("/proc/mounts", "r");
- if (!fp)
- die("Can't open /proc/mounts for read");
-
- while ((m = getmntent(fp)) != NULL) {
- if (strcmp(m->mnt_type, "debugfs") == 0) {
- strcpy(debugfs, m->mnt_dir);
- debugfs_found = 1;
- break;
- }
- }
-
- endmntent(fp);
+ const char *path = debugfs_mount(NULL);
- if (!debugfs_found)
- die("debugfs not mounted, please mount");
+ if (!path)
+ die("Your kernel not support debugfs filesystem");
- return debugfs;
+ return path;
}
/*