From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755333AbbIHOfe (ORCPT ); Tue, 8 Sep 2015 10:35:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52307 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754827AbbIHOf3 (ORCPT ); Tue, 8 Sep 2015 10:35:29 -0400 Date: Tue, 8 Sep 2015 07:35:08 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, matt@codeblueprint.co.uk, rostedt@goodmis.org, acme@redhat.com, jolsa@kernel.org, raphael.beamonte@gmail.com Reply-To: dsahern@gmail.com, mingo@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, raphael.beamonte@gmail.com, jolsa@kernel.org, acme@redhat.com, rostedt@goodmis.org, matt@codeblueprint.co.uk In-Reply-To: <1441180605-24737-11-git-send-email-jolsa@kernel.org> References: <1441180605-24737-11-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib api fs: Add tracefs into fs.c object Git-Commit-ID: c495afb4988dcbb8bae11b8f1bbb7e11f172672b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c495afb4988dcbb8bae11b8f1bbb7e11f172672b Gitweb: http://git.kernel.org/tip/c495afb4988dcbb8bae11b8f1bbb7e11f172672b Author: Jiri Olsa AuthorDate: Wed, 2 Sep 2015 09:56:40 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 4 Sep 2015 12:01:00 -0300 tools lib api fs: Add tracefs into fs.c object Adding tracefs support into fs.c framework. It'll replace the tracefs object functionality in following patches. Signed-off-by: Jiri Olsa Cc: Raphael Beamonte Cc: David Ahern Cc: Matt Fleming Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1441180605-24737-11-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/api/fs/fs.c | 28 ++++++++++++++++++++++++++++ tools/lib/api/fs/fs.h | 1 + 2 files changed, 29 insertions(+) diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c index 798052c..ef16d2a 100644 --- a/tools/lib/api/fs/fs.c +++ b/tools/lib/api/fs/fs.c @@ -28,6 +28,10 @@ #define DEBUGFS_MAGIC 0x64626720 #endif +#ifndef TRACEFS_MAGIC +#define TRACEFS_MAGIC 0x74726163 +#endif + static const char * const sysfs__fs_known_mountpoints[] = { "/sys", 0, @@ -48,6 +52,19 @@ static const char * const debugfs__known_mountpoints[] = { 0, }; + +#ifndef TRACEFS_DEFAULT_PATH +#define TRACEFS_DEFAULT_PATH "/sys/kernel/tracing" +#endif + +static const char * const tracefs__known_mountpoints[] = { + TRACEFS_DEFAULT_PATH, + "/sys/kernel/debug/tracing", + "/tracing", + "/trace", + 0, +}; + struct fs { const char *name; const char * const *mounts; @@ -60,8 +77,13 @@ enum { FS__SYSFS = 0, FS__PROCFS = 1, FS__DEBUGFS = 2, + FS__TRACEFS = 3, }; +#ifndef TRACEFS_MAGIC +#define TRACEFS_MAGIC 0x74726163 +#endif + static struct fs fs__entries[] = { [FS__SYSFS] = { .name = "sysfs", @@ -78,6 +100,11 @@ static struct fs fs__entries[] = { .mounts = debugfs__known_mountpoints, .magic = DEBUGFS_MAGIC, }, + [FS__TRACEFS] = { + .name = "tracefs", + .mounts = tracefs__known_mountpoints, + .magic = TRACEFS_MAGIC, + }, }; static bool fs__read_mounts(struct fs *fs) @@ -197,6 +224,7 @@ const char *name##__mountpoint(void) \ FS__MOUNTPOINT(sysfs, FS__SYSFS); FS__MOUNTPOINT(procfs, FS__PROCFS); FS__MOUNTPOINT(debugfs, FS__DEBUGFS); +FS__MOUNTPOINT(tracefs, FS__TRACEFS); 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 a4e6b1d..9013227 100644 --- a/tools/lib/api/fs/fs.h +++ b/tools/lib/api/fs/fs.h @@ -12,6 +12,7 @@ const char *sysfs__mountpoint(void); const char *procfs__mountpoint(void); const char *debugfs__mountpoint(void); +const char *tracefs__mountpoint(void); int filename__read_int(const char *filename, int *value); int sysctl__read_int(const char *sysctl, int *value);