lkml.org 
[lkml]   [2015]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] tools lib api fs: Replace debugfs/ tracefs objects interface with fs.c
    Commit-ID:  4605eab3487dc818b1f3cbee2cd139cca3564be7
    Gitweb: http://git.kernel.org/tip/4605eab3487dc818b1f3cbee2cd139cca3564be7
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Wed, 2 Sep 2015 09:56:43 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 14 Sep 2015 12:50:15 -0300

    tools lib api fs: Replace debugfs/tracefs objects interface with fs.c

    Switching to the fs.c related filesystem framework.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Matt Fleming <matt@codeblueprint.co.uk>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/1441180605-24737-14-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/lib/api/fs/fs.c | 1 -
    tools/lib/api/fs/tracing_path.c | 15 +++++++--------
    tools/perf/builtin-kvm.c | 1 -
    tools/perf/builtin-probe.c | 1 -
    tools/perf/tests/openat-syscall-all-cpus.c | 5 +++--
    tools/perf/tests/openat-syscall.c | 5 +++--
    tools/perf/tests/parse-events.c | 7 +++----
    tools/perf/util/evsel.c | 2 +-
    tools/perf/util/probe-event.c | 5 ++---
    tools/perf/util/probe-file.c | 7 +++----
    tools/perf/util/util.h | 3 +--
    11 files changed, 23 insertions(+), 29 deletions(-)

    diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c
    index 8afe08a..7915093 100644
    --- a/tools/lib/api/fs/fs.c
    +++ b/tools/lib/api/fs/fs.c
    @@ -11,7 +11,6 @@
    #include <unistd.h>
    #include <sys/mount.h>

    -#include "debugfs.h"
    #include "fs.h"

    #define _STR(x) #x
    diff --git a/tools/lib/api/fs/tracing_path.c b/tools/lib/api/fs/tracing_path.c
    index 1e0bb0d..38aca2d 100644
    --- a/tools/lib/api/fs/tracing_path.c
    +++ b/tools/lib/api/fs/tracing_path.c
    @@ -7,8 +7,7 @@
    #include <string.h>
    #include <errno.h>
    #include <unistd.h>
    -#include "debugfs.h"
    -#include "tracefs.h"
    +#include "fs.h"

    #include "tracing_path.h"

    @@ -29,7 +28,7 @@ static const char *tracing_path_tracefs_mount(void)
    {
    const char *mnt;

    - mnt = tracefs_mount(NULL);
    + mnt = tracefs__mount();
    if (!mnt)
    return NULL;

    @@ -42,7 +41,7 @@ static const char *tracing_path_debugfs_mount(void)
    {
    const char *mnt;

    - mnt = debugfs_mount(NULL);
    + mnt = debugfs__mount();
    if (!mnt)
    return NULL;

    @@ -96,7 +95,7 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename)
    * want some tracepoint which wasn't compiled in your kernel.
    * - jirka
    */
    - if (debugfs_configured() || tracefs_configured()) {
    + if (debugfs__configured() || tracefs__configured()) {
    snprintf(buf, size,
    "Error:\tFile %s/%s not found.\n"
    "Hint:\tPerhaps this kernel misses some CONFIG_ setting to enable this feature?.\n",
    @@ -110,13 +109,13 @@ static int strerror_open(int err, char *buf, size_t size, const char *filename)
    "Hint:\tTry 'sudo mount -t debugfs nodev /sys/kernel/debug'");
    break;
    case EACCES: {
    - const char *mountpoint = debugfs_find_mountpoint();
    + const char *mountpoint = debugfs__mountpoint();

    if (!access(mountpoint, R_OK) && strncmp(filename, "tracing/", 8) == 0) {
    - const char *tracefs_mntpoint = tracefs_find_mountpoint();
    + const char *tracefs_mntpoint = tracefs__mountpoint();

    if (tracefs_mntpoint)
    - mountpoint = tracefs_find_mountpoint();
    + mountpoint = tracefs__mountpoint();
    }

    snprintf(buf, size,
    diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
    index fc1cffb..dd94b4c 100644
    --- a/tools/perf/builtin-kvm.c
    +++ b/tools/perf/builtin-kvm.c
    @@ -13,7 +13,6 @@
    #include "util/parse-options.h"
    #include "util/trace-event.h"
    #include "util/debug.h"
    -#include <api/fs/debugfs.h>
    #include "util/tool.h"
    #include "util/stat.h"
    #include "util/top.h"
    diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
    index ee2c46d..2bec9c1 100644
    --- a/tools/perf/builtin-probe.c
    +++ b/tools/perf/builtin-probe.c
    @@ -37,7 +37,6 @@
    #include "util/strfilter.h"
    #include "util/symbol.h"
    #include "util/debug.h"
    -#include <api/fs/debugfs.h>
    #include "util/parse-options.h"
    #include "util/probe-finder.h"
    #include "util/probe-event.h"
    diff --git a/tools/perf/tests/openat-syscall-all-cpus.c b/tools/perf/tests/openat-syscall-all-cpus.c
    index a572f87..a38adf9 100644
    --- a/tools/perf/tests/openat-syscall-all-cpus.c
    +++ b/tools/perf/tests/openat-syscall-all-cpus.c
    @@ -1,3 +1,4 @@
    +#include <api/fs/fs.h>
    #include "evsel.h"
    #include "tests.h"
    #include "thread_map.h"
    @@ -30,9 +31,9 @@ int test__openat_syscall_event_on_all_cpus(void)

    evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
    if (evsel == NULL) {
    - if (tracefs_configured())
    + if (tracefs__configured())
    pr_debug("is tracefs mounted on /sys/kernel/tracing?\n");
    - else if (debugfs_configured())
    + else if (debugfs__configured())
    pr_debug("is debugfs mounted on /sys/kernel/debug?\n");
    else
    pr_debug("Neither tracefs or debugfs is enabled in this kernel\n");
    diff --git a/tools/perf/tests/openat-syscall.c b/tools/perf/tests/openat-syscall.c
    index c9a37bc..8048c7d 100644
    --- a/tools/perf/tests/openat-syscall.c
    +++ b/tools/perf/tests/openat-syscall.c
    @@ -1,3 +1,4 @@
    +#include <api/fs/fs.h>
    #include "thread_map.h"
    #include "evsel.h"
    #include "debug.h"
    @@ -18,9 +19,9 @@ int test__openat_syscall_event(void)

    evsel = perf_evsel__newtp("syscalls", "sys_enter_openat");
    if (evsel == NULL) {
    - if (tracefs_configured())
    + if (tracefs__configured())
    pr_debug("is tracefs mounted on /sys/kernel/tracing?\n");
    - else if (debugfs_configured())
    + else if (debugfs__configured())
    pr_debug("is debugfs mounted on /sys/kernel/debug?\n");
    else
    pr_debug("Neither tracefs or debugfs is enabled in this kernel\n");
    diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
    index 9b6b2b63..91fbfd5 100644
    --- a/tools/perf/tests/parse-events.c
    +++ b/tools/perf/tests/parse-events.c
    @@ -3,11 +3,10 @@
    #include "evsel.h"
    #include "evlist.h"
    #include <api/fs/fs.h>
    -#include <api/fs/tracefs.h>
    -#include <api/fs/debugfs.h>
    #include "tests.h"
    #include "debug.h"
    #include <linux/hw_breakpoint.h>
    +#include <api/fs/fs.h>

    #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
    PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)
    @@ -1268,12 +1267,12 @@ static int count_tracepoints(void)
    DIR *events_dir;
    int cnt = 0;

    - mountpoint = tracefs_find_mountpoint();
    + mountpoint = tracefs__mountpoint();
    if (mountpoint) {
    scnprintf(events_path, PATH_MAX, "%s/events",
    mountpoint);
    } else {
    - mountpoint = debugfs_find_mountpoint();
    + mountpoint = debugfs__mountpoint();
    scnprintf(events_path, PATH_MAX, "%s/tracing/events",
    mountpoint);
    }
    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index c53f791..771ade4 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -9,7 +9,7 @@

    #include <byteswap.h>
    #include <linux/bitops.h>
    -#include <api/fs/debugfs.h>
    +#include <api/fs/tracing_path.h>
    #include <traceevent/event-parse.h>
    #include <linux/hw_breakpoint.h>
    #include <linux/perf_event.h>
    diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    index 3da9e1c..5964ecc 100644
    --- a/tools/perf/util/probe-event.c
    +++ b/tools/perf/util/probe-event.c
    @@ -40,8 +40,7 @@
    #include "color.h"
    #include "symbol.h"
    #include "thread.h"
    -#include <api/fs/debugfs.h>
    -#include <api/fs/tracefs.h>
    +#include <api/fs/fs.h>
    #include "trace-event.h" /* For __maybe_unused */
    #include "probe-event.h"
    #include "probe-finder.h"
    @@ -2054,7 +2053,7 @@ static void kprobe_blacklist__delete(struct list_head *blacklist)
    static int kprobe_blacklist__load(struct list_head *blacklist)
    {
    struct kprobe_blacklist_node *node;
    - const char *__debugfs = debugfs_find_mountpoint();
    + const char *__debugfs = debugfs__mountpoint();
    char buf[PATH_MAX], *p;
    FILE *fp;
    int ret;
    diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
    index 38c0a62..499c83c 100644
    --- a/tools/perf/util/probe-file.c
    +++ b/tools/perf/util/probe-file.c
    @@ -22,8 +22,7 @@
    #include "color.h"
    #include "symbol.h"
    #include "thread.h"
    -#include <api/fs/debugfs.h>
    -#include <api/fs/tracefs.h>
    +#include <api/fs/fs.h>
    #include "probe-event.h"
    #include "probe-file.h"
    #include "session.h"
    @@ -77,11 +76,11 @@ static int open_probe_events(const char *trace_file, bool readwrite)
    const char *tracing_dir = "";
    int ret;

    - __debugfs = tracefs_find_mountpoint();
    + __debugfs = tracefs__mountpoint();
    if (__debugfs == NULL) {
    tracing_dir = "tracing/";

    - __debugfs = debugfs_find_mountpoint();
    + __debugfs = debugfs__mountpoint();
    if (__debugfs == NULL)
    return -ENOTSUP;
    }
    diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
    index 495b99c..3d5b01e 100644
    --- a/tools/perf/util/util.h
    +++ b/tools/perf/util/util.h
    @@ -74,8 +74,7 @@
    #include <linux/magic.h>
    #include <linux/types.h>
    #include <sys/ttydefaults.h>
    -#include <api/fs/debugfs.h>
    -#include <api/fs/tracefs.h>
    +#include <api/fs/tracing_path.h>
    #include <termios.h>
    #include <linux/bitops.h>
    #include <termios.h>

    \
     
     \ /
      Last update: 2015-09-15 09:21    [W:4.537 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site