From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
"David Ahern" <dsahern@gmail.com>,
"Ingo Molnar" <mingo@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
"Matt Fleming" <matt@codeblueprint.co.uk>,
"Raphaël Beamonte" <raphael.beamonte@gmail.com>,
"Steven Rostedt" <rostedt@goodmis.org>
Subject: [PATCH 09/15] tools lib api: Add debugfs into fs.c object
Date: Wed, 2 Sep 2015 09:56:39 +0200 [thread overview]
Message-ID: <1441180605-24737-10-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1441180605-24737-1-git-send-email-jolsa@kernel.org>
Adding debugfs support into fs.c framework. It'll replace
the debugfs object functionality in following patches.
Link: http://lkml.kernel.org/n/tip-6n8d5bxn47oqcvlhzqw09dol@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/lib/api/fs/fs.c | 31 +++++++++++++++++++++++++------
tools/lib/api/fs/fs.h | 1 +
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
index 0700eb953495..798052cbc7c0 100644
--- a/tools/lib/api/fs/fs.c
+++ b/tools/lib/api/fs/fs.c
@@ -1,5 +1,3 @@
-/* TODO merge/factor in debugfs.c here */
-
#include <ctype.h>
#include <errno.h>
#include <stdbool.h>
@@ -26,6 +24,10 @@
#define PROC_SUPER_MAGIC 0x9fa0
#endif
+#ifndef DEBUGFS_MAGIC
+#define DEBUGFS_MAGIC 0x64626720
+#endif
+
static const char * const sysfs__fs_known_mountpoints[] = {
"/sys",
0,
@@ -36,6 +38,16 @@ static const char * const procfs__known_mountpoints[] = {
0,
};
+#ifndef DEBUGFS_DEFAULT_PATH
+#define DEBUGFS_DEFAULT_PATH "/sys/kernel/debug"
+#endif
+
+static const char * const debugfs__known_mountpoints[] = {
+ DEBUGFS_DEFAULT_PATH,
+ "/debug",
+ 0,
+};
+
struct fs {
const char *name;
const char * const *mounts;
@@ -45,8 +57,9 @@ struct fs {
};
enum {
- FS__SYSFS = 0,
- FS__PROCFS = 1,
+ FS__SYSFS = 0,
+ FS__PROCFS = 1,
+ FS__DEBUGFS = 2,
};
static struct fs fs__entries[] = {
@@ -60,6 +73,11 @@ static struct fs fs__entries[] = {
.mounts = procfs__known_mountpoints,
.magic = PROC_SUPER_MAGIC,
},
+ [FS__DEBUGFS] = {
+ .name = "debugfs",
+ .mounts = debugfs__known_mountpoints,
+ .magic = DEBUGFS_MAGIC,
+ },
};
static bool fs__read_mounts(struct fs *fs)
@@ -176,8 +194,9 @@ const char *name##__mountpoint(void) \
return fs__mountpoint(idx); \
}
-FS__MOUNTPOINT(sysfs, FS__SYSFS);
-FS__MOUNTPOINT(procfs, FS__PROCFS);
+FS__MOUNTPOINT(sysfs, FS__SYSFS);
+FS__MOUNTPOINT(procfs, FS__PROCFS);
+FS__MOUNTPOINT(debugfs, FS__DEBUGFS);
int filename__read_int(const char *filename, int *value)
{
diff --git a/tools/lib/api/fs/fs.h b/tools/lib/api/fs/fs.h
index 674efc8dfd9b..a4e6b1d93d2f 100644
--- a/tools/lib/api/fs/fs.h
+++ b/tools/lib/api/fs/fs.h
@@ -11,6 +11,7 @@
const char *sysfs__mountpoint(void);
const char *procfs__mountpoint(void);
+const char *debugfs__mountpoint(void);
int filename__read_int(const char *filename, int *value);
int sysctl__read_int(const char *sysctl, int *value);
--
2.4.3
next prev parent reply other threads:[~2015-09-02 7:57 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-02 7:56 [PATCH 00/15] perf tools: Cleanup filesystem api Jiri Olsa
2015-09-02 7:56 ` [PATCH 01/15] perf tools: Fix parse_events_add_pmu caller Jiri Olsa
2015-09-02 13:00 ` Arnaldo Carvalho de Melo
2015-09-02 13:34 ` Jiri Olsa
2015-09-05 14:00 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 02/15] perf tools: Remove mountpoint arg from perf_debugfs_mount Jiri Olsa
2015-09-08 14:32 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 03/15] perf tools: Move tracing_path stuff under same namespace Jiri Olsa
2015-09-08 14:33 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 04/15] perf tools: Move tracing_path interface into api/fs/tracing_path.c Jiri Olsa
2015-09-04 11:35 ` Matt Fleming
2015-09-04 13:28 ` Raphaël Beamonte
2015-09-08 14:33 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 05/15] tools lib api: Move debugfs__strerror_open into tracing_path.c object Jiri Olsa
2015-09-02 13:12 ` Arnaldo Carvalho de Melo
2015-09-04 11:36 ` Matt Fleming
2015-09-04 13:41 ` Raphaël Beamonte
2015-09-04 13:48 ` Jiri Olsa
2015-09-04 13:51 ` Raphaël Beamonte
2015-09-08 14:33 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 06/15] tools lib api: Make tracing_path_strerror_open message generic Jiri Olsa
2015-09-02 13:18 ` Arnaldo Carvalho de Melo
2015-09-02 13:44 ` Jiri Olsa
2015-09-02 14:16 ` Arnaldo Carvalho de Melo
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 07/15] tools lib api: Add STR and PATH_MAX macros to fs object Jiri Olsa
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 08/15] tools lib api: Move SYSFS_MAGIC PROC_SUPER_MAGIC into fs.c Jiri Olsa
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` Jiri Olsa [this message]
2015-09-08 14:34 ` [tip:perf/core] tools lib api fs: Add debugfs into fs.c object tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 10/15] tools lib api: Add tracefs " Jiri Olsa
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 11/15] tools lib api: Add mount support for fs Jiri Olsa
2015-09-04 14:14 ` Raphaël Beamonte
2015-09-04 14:20 ` Steven Rostedt
2015-09-04 14:26 ` Jiri Olsa
2015-09-04 14:57 ` Steven Rostedt
2015-09-04 15:00 ` Steven Rostedt
2015-09-04 15:12 ` Raphaël Beamonte
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: Add FSTYPE__mount() method tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 12/15] tools lib api: Add configured support for fs Jiri Olsa
2015-09-02 13:39 ` Arnaldo Carvalho de Melo
2015-09-02 13:41 ` Arnaldo Carvalho de Melo
2015-09-02 13:46 ` Jiri Olsa
2015-09-02 14:17 ` Arnaldo Carvalho de Melo
2015-09-02 16:52 ` Arnaldo Carvalho de Melo
2015-09-04 7:08 ` Jiri Olsa
2015-09-04 16:42 ` Arnaldo Carvalho de Melo
2015-09-04 17:45 ` Jiri Olsa
2015-09-08 14:35 ` [tip:perf/core] tools lib api fs: Add FSTYPE__configured() method tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 13/15] tools lib api: Replace debugfs/tracefs objects interface with fs.c Jiri Olsa
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: Replace debugfs/ tracefs " tip-bot for Jiri Olsa
2015-09-02 7:56 ` [PATCH 14/15] tools lib api: Remove debugfs, tracefs and findfs objects Jiri Olsa
2015-09-15 6:59 ` [tip:perf/core] tools lib api fs: " tip-bot for Jiri Olsa
2015-09-22 0:20 ` Vinson Lee
2015-09-22 13:53 ` Arnaldo Carvalho de Melo
2015-09-22 21:29 ` Vinson Lee
2015-09-23 8:23 ` Matt Fleming
2015-09-23 8:39 ` Jiri Olsa
2015-09-23 10:08 ` Matt Fleming
2015-09-24 15:05 ` Michael Petlan
2015-10-07 20:10 ` Matt Fleming
2015-10-13 19:18 ` Arnaldo Carvalho de Melo
2015-09-23 13:44 ` Arnaldo Carvalho de Melo
2015-09-23 13:50 ` Jiri Olsa
2015-09-23 13:54 ` Arnaldo Carvalho de Melo
2015-09-24 12:15 ` Matt Fleming
2015-09-24 14:29 ` Arnaldo Carvalho de Melo
2015-09-02 7:56 ` [PATCH 15/15] perf tools: Switch to tracing_path interface on appropriate places Jiri Olsa
2015-09-15 7:00 ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-09-02 8:01 ` [PATCH 00/15] perf tools: Cleanup filesystem api Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441180605-24737-10-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=raphael.beamonte@gmail.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).