lkml.org 
[lkml]   [2015]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/31] perf tools: Move tracing_path stuff under same namespace
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    Renaming all functions touching tracing_path under same namespace. New
    interface is:

    char tracing_path[];
    - tracing mount path

    char tracing_events_path[];
    - tracing mount/events path

    void tracing_path_set(const char *mountpoint);
    - setting directly tracing_path(_events), used by --debugfs-dir option

    const char *tracing_path_mount(void);
    - initial setup of tracing_(events)_path, called from perf.c
    mounts debugfs/tracefs if needed and possible

    char *get_tracing_file(const char *name);
    void put_tracing_file(char *file);
    - get/put tracing file path

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
    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: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/1441180605-24737-4-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/perf.c | 10 ++++++----
    tools/perf/util/util.c | 20 ++++++++++----------
    tools/perf/util/util.h | 4 ++--
    3 files changed, 18 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/perf.c b/tools/perf/perf.c
    index f500a4b40722..0e99cd1de9dd 100644
    --- a/tools/perf/perf.c
    +++ b/tools/perf/perf.c
    @@ -214,7 +214,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
    fprintf(stderr, "No directory given for --debugfs-dir.\n");
    usage(perf_usage_string);
    }
    - perf_debugfs_set_path((*argv)[1]);
    + tracing_path_set((*argv)[1]);
    if (envchanged)
    *envchanged = 1;
    (*argv)++;
    @@ -230,7 +230,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
    (*argv)++;
    (*argc)--;
    } else if (!prefixcmp(cmd, CMD_DEBUGFS_DIR)) {
    - perf_debugfs_set_path(cmd + strlen(CMD_DEBUGFS_DIR));
    + tracing_path_set(cmd + strlen(CMD_DEBUGFS_DIR));
    fprintf(stderr, "dir: %s\n", tracing_path);
    if (envchanged)
    *envchanged = 1;
    @@ -517,8 +517,10 @@ int main(int argc, const char **argv)
    cmd = perf_extract_argv0_path(argv[0]);
    if (!cmd)
    cmd = "perf-help";
    - /* get debugfs mount point from /proc/mounts */
    - perf_debugfs_mount();
    +
    + /* get debugfs/tracefs mount point from /proc/mounts */
    + tracing_path_mount();
    +
    /*
    * "perf-xxxx" is the same as "perf xxxx", but we obviously:
    *
    diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
    index 74f71f8afcc2..b959f783f6cd 100644
    --- a/tools/perf/util/util.c
    +++ b/tools/perf/util/util.c
    @@ -390,7 +390,7 @@ void set_term_quiet_input(struct termios *old)
    tcsetattr(0, TCSANOW, &tc);
    }

    -static void set_tracing_events_path(const char *tracing, const char *mountpoint)
    +static void __tracing_path_set(const char *tracing, const char *mountpoint)
    {
    snprintf(tracing_path, sizeof(tracing_path), "%s/%s",
    mountpoint, tracing);
    @@ -398,7 +398,7 @@ static void set_tracing_events_path(const char *tracing, const char *mountpoint)
    mountpoint, tracing, "events");
    }

    -static const char *__perf_tracefs_mount(void)
    +static const char *tracing_path_tracefs_mount(void)
    {
    const char *mnt;

    @@ -406,12 +406,12 @@ static const char *__perf_tracefs_mount(void)
    if (!mnt)
    return NULL;

    - set_tracing_events_path("", mnt);
    + __tracing_path_set("", mnt);

    return mnt;
    }

    -static const char *__perf_debugfs_mount(void)
    +static const char *tracing_path_debugfs_mount(void)
    {
    const char *mnt;

    @@ -419,27 +419,27 @@ static const char *__perf_debugfs_mount(void)
    if (!mnt)
    return NULL;

    - set_tracing_events_path("tracing/", mnt);
    + __tracing_path_set("tracing/", mnt);

    return mnt;
    }

    -const char *perf_debugfs_mount(void)
    +const char *tracing_path_mount(void)
    {
    const char *mnt;

    - mnt = __perf_tracefs_mount();
    + mnt = tracing_path_tracefs_mount();
    if (mnt)
    return mnt;

    - mnt = __perf_debugfs_mount();
    + mnt = tracing_path_debugfs_mount();

    return mnt;
    }

    -void perf_debugfs_set_path(const char *mntpt)
    +void tracing_path_set(const char *mntpt)
    {
    - set_tracing_events_path("tracing/", mntpt);
    + __tracing_path_set("tracing/", mntpt);
    }

    char *get_tracing_file(const char *name)
    diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
    index 48ec232b6f66..bbf8a937d780 100644
    --- a/tools/perf/util/util.h
    +++ b/tools/perf/util/util.h
    @@ -85,8 +85,8 @@ extern const char *graph_dotted_line;
    extern char buildid_dir[];
    extern char tracing_path[];
    extern char tracing_events_path[];
    -extern void perf_debugfs_set_path(const char *mountpoint);
    -const char *perf_debugfs_mount(void);
    +extern void tracing_path_set(const char *mountpoint);
    +const char *tracing_path_mount(void);
    char *get_tracing_file(const char *name);
    void put_tracing_file(char *file);

    --
    2.1.0


    \
     
     \ /
      Last update: 2015-09-04 19:01    [W:2.345 / U:0.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site