lkml.org 
[lkml]   [2009]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 28 Dec 2009 16:48:30 +0800
FromXiao Guangrong <>
Subject[PATCH 2/3] perf trace: cleanup find_debugfs()
Remove redundant code for 'perf trace'

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
tools/perf/util/debugfs.c | 1 +
tools/perf/util/trace-event-info.c | 29 +++++------------------------
2 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/tools/perf/util/debugfs.c b/tools/perf/util/debugfs.c
index 1f805fd..a88fefc 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 cace355..5dd5c81 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -37,6 +37,7 @@

#include "../perf.h"
#include "trace-event.h"
+#include "debugfs.h"

#define VERSION "0.5"

@@ -101,32 +102,12 @@ void *malloc_or_die(unsigned int size)

static const char *find_debugfs(void)
{
- static char debugfs[MAX_PATH+1];
- static int debugfs_found;
- char type[100];
- FILE *fp;
-
- if (debugfs_found)
- return debugfs;
-
- if ((fp = fopen("/proc/mounts","r")) == NULL)
- die("Can't open /proc/mounts for read");
-
- while (fscanf(fp, "%*s %"
- STR(MAX_PATH)
- "s %99s %*s %*d %*d\n",
- debugfs, type) == 2) {
- if (strcmp(type, "debugfs") == 0)
- break;
- }
- fclose(fp);
-
- if (strcmp(type, "debugfs") != 0)
- die("debugfs not mounted, please mount");
+ const char *path = debugfs_mount(NULL);

- debugfs_found = 1;
+ if (!path)
+ die("Your kernel not support debugfs filesystem");

- return debugfs;
+ return path;
}

/*
--
1.6.1.2



\
 
 \ /
  Last update: 2009-12-28 09:53    [from the cache]
©2003-2010