lkml.org 
[lkml]   [2015]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/13] perf env: Rename some leftovers from rename to perf_env
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    In ce80d3bef9ff ("perf tools: Rename perf_session_env to perf_env") we
    forgot to rename a few functions to the "perf_env" prefix, do it now.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/n/tip-b3ui3z6ock89z1814pu2er98@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/arch/common.c | 10 ++++------
    tools/perf/arch/common.h | 4 ++--
    tools/perf/builtin-annotate.c | 2 +-
    tools/perf/builtin-top.c | 2 +-
    tools/perf/ui/browsers/hists.c | 2 +-
    5 files changed, 9 insertions(+), 11 deletions(-)

    diff --git a/tools/perf/arch/common.c b/tools/perf/arch/common.c
    index b00dfd92ea73..e83c8ce24303 100644
    --- a/tools/perf/arch/common.c
    +++ b/tools/perf/arch/common.c
    @@ -128,9 +128,8 @@ static const char *normalize_arch(char *arch)
    return arch;
    }

    -static int perf_session_env__lookup_binutils_path(struct perf_env *env,
    - const char *name,
    - const char **path)
    +static int perf_env__lookup_binutils_path(struct perf_env *env,
    + const char *name, const char **path)
    {
    int idx;
    const char *arch, *cross_env;
    @@ -206,7 +205,7 @@ out_error:
    return -1;
    }

    -int perf_session_env__lookup_objdump(struct perf_env *env)
    +int perf_env__lookup_objdump(struct perf_env *env)
    {
    /*
    * For live mode, env->arch will be NULL and we can use
    @@ -215,6 +214,5 @@ int perf_session_env__lookup_objdump(struct perf_env *env)
    if (env->arch == NULL)
    return 0;

    - return perf_session_env__lookup_binutils_path(env, "objdump",
    - &objdump_path);
    + return perf_env__lookup_binutils_path(env, "objdump", &objdump_path);
    }
    diff --git a/tools/perf/arch/common.h b/tools/perf/arch/common.h
    index 20176df69fc8..7529cfb143ce 100644
    --- a/tools/perf/arch/common.h
    +++ b/tools/perf/arch/common.h
    @@ -1,10 +1,10 @@
    #ifndef ARCH_PERF_COMMON_H
    #define ARCH_PERF_COMMON_H

    -#include "../util/session.h"
    +#include "../util/env.h"

    extern const char *objdump_path;

    -int perf_session_env__lookup_objdump(struct perf_env *env);
    +int perf_env__lookup_objdump(struct perf_env *env);

    #endif /* ARCH_PERF_COMMON_H */
    diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
    index 8edc205ff9a7..2bf9b3fd9e61 100644
    --- a/tools/perf/builtin-annotate.c
    +++ b/tools/perf/builtin-annotate.c
    @@ -211,7 +211,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
    }

    if (!objdump_path) {
    - ret = perf_session_env__lookup_objdump(&session->header.env);
    + ret = perf_env__lookup_objdump(&session->header.env);
    if (ret)
    goto out;
    }
    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index 8c465c83aabf..e5ca6848f01d 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -952,7 +952,7 @@ static int __cmd_top(struct perf_top *top)
    machines__set_symbol_filter(&top->session->machines, symbol_filter);

    if (!objdump_path) {
    - ret = perf_session_env__lookup_objdump(&top->session->header.env);
    + ret = perf_env__lookup_objdump(&top->session->header.env);
    if (ret)
    goto out_delete;
    }
    diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
    index e4fd40f72b4a..fea29fbb9d47 100644
    --- a/tools/perf/ui/browsers/hists.c
    +++ b/tools/perf/ui/browsers/hists.c
    @@ -1442,7 +1442,7 @@ do_annotate(struct hist_browser *browser, struct popup_action *act)
    struct hist_entry *he;
    int err;

    - if (!objdump_path && perf_session_env__lookup_objdump(browser->env))
    + if (!objdump_path && perf_env__lookup_objdump(browser->env))
    return 0;

    notes = symbol__annotation(act->ms.sym);
    --
    2.1.0


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