lkml.org 
[lkml]   [2011]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v6 3.2-rc1 24/28] perf: show possible probes in a given executable file or library.

    Enhances -F/--funcs option of "perf probe" to list possible probe points in
    an executable file or library.

    Show last 10 functions in /bin/zsh.

    # perf probe -F -x /bin/zsh | tail
    zstrtol
    ztrcmp
    ztrdup
    ztrduppfx
    ztrftime
    ztrlen
    ztrncpy
    ztrsub
    zwarn
    zwarnnam

    Show first 10 functions in /lib/libc.so.6

    # perf probe -F -x /lib/libc.so.6 | head
    _IO_adjust_column
    _IO_adjust_wcolumn
    _IO_default_doallocate
    _IO_default_finish
    _IO_default_pbackfail
    _IO_default_uflow
    _IO_default_xsgetn
    _IO_default_xsputn
    _IO_do_write@@GLIBC_2.2.5
    _IO_doallocbuf

    Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
    ---

    (Changelog (since v5)
    - Removed the separate documentation change patch and added the
    documentation changes as part of this patch.

    tools/perf/Documentation/perf-probe.txt | 4 ++
    tools/perf/builtin-probe.c | 4 +-
    tools/perf/util/probe-event.c | 55 ++++++++++++++++++++++++-------
    tools/perf/util/probe-event.h | 4 +-
    4 files changed, 49 insertions(+), 18 deletions(-)

    diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
    index 469ad6d..be88378 100644
    --- a/tools/perf/Documentation/perf-probe.txt
    +++ b/tools/perf/Documentation/perf-probe.txt
    @@ -78,6 +78,8 @@ OPTIONS
    -F::
    --funcs::
    Show available functions in given module or kernel.
    + With -x/--exec, can also list functions in a user space executable
    + / shared library.

    --filter=FILTER::
    (Only for --vars and --funcs) Set filter. FILTER is a combination of glob
    @@ -101,7 +103,7 @@ OPTIONS
    -x::
    --exec=PATH::
    Specify path to the executable or shared library file for user
    - space tracing.
    + space tracing. Can also be used with --funcs option.

    PROBE SYNTAX
    ------------
    diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
    index 43e6321..5e7622c 100644
    --- a/tools/perf/builtin-probe.c
    +++ b/tools/perf/builtin-probe.c
    @@ -365,8 +365,8 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
    if (!params.filter)
    params.filter = strfilter__new(DEFAULT_FUNC_FILTER,
    NULL);
    - ret = show_available_funcs(params.target,
    - params.filter);
    + ret = show_available_funcs(params.target, params.filter,
    + params.uprobes);
    strfilter__delete(params.filter);
    if (ret < 0)
    pr_err(" Error: Failed to show functions."
    diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    index d4f4c2b..2c4ec61 100644
    --- a/tools/perf/util/probe-event.c
    +++ b/tools/perf/util/probe-event.c
    @@ -47,6 +47,7 @@
    #include "trace-event.h" /* For __unused */
    #include "probe-event.h"
    #include "probe-finder.h"
    +#include "session.h"

    #define MAX_CMDLEN 256
    #define MAX_PROBE_ARGS 128
    @@ -2179,32 +2180,60 @@ static int filter_available_functions(struct map *map __unused,
    return 1;
    }

    -int show_available_funcs(const char *target, struct strfilter *_filter)
    +static int __show_available_funcs(struct map *map)
    +{
    + if (map__load(map, filter_available_functions)) {
    + pr_err("Failed to load map.\n");
    + return -EINVAL;
    + }
    + if (!dso__sorted_by_name(map->dso, map->type))
    + dso__sort_by_name(map->dso, map->type);
    +
    + dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
    + return 0;
    +}
    +
    +static int available_kernel_funcs(const char *module)
    {
    struct map *map;
    int ret;

    - setup_pager();
    -
    ret = init_vmlinux();
    if (ret < 0)
    return ret;

    - map = kernel_get_module_map(target);
    + map = kernel_get_module_map(module);
    if (!map) {
    - pr_err("Failed to find %s map.\n", (target) ? : "kernel");
    + pr_err("Failed to find %s map.\n", (module) ? : "kernel");
    return -EINVAL;
    }
    + return __show_available_funcs(map);
    +}
    +
    +int show_available_funcs(const char *target, struct strfilter *_filter,
    + bool user)
    +{
    + struct map *map;
    + int ret;
    +
    + setup_pager();
    available_func_filter = _filter;
    - if (map__load(map, filter_available_functions)) {
    - pr_err("Failed to load map.\n");
    - return -EINVAL;
    - }
    - if (!dso__sorted_by_name(map->dso, map->type))
    - dso__sort_by_name(map->dso, map->type);

    - dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
    - return 0;
    + if (!user)
    + return available_kernel_funcs(target);
    +
    + symbol_conf.try_vmlinux_path = false;
    + symbol_conf.sort_by_name = true;
    + ret = symbol__init();
    + if (ret < 0) {
    + pr_err("Failed to init symbol map.\n");
    + return ret;
    + }
    + map = dso__new_map(target);
    + ret = __show_available_funcs(map);
    + dso__delete(map->dso);
    + map__delete(map);
    + return ret;
    }

    #define DEFAULT_FUNC_FILTER "!_*"
    diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
    index 9e8c846..f9f3de8 100644
    --- a/tools/perf/util/probe-event.h
    +++ b/tools/perf/util/probe-event.h
    @@ -131,8 +131,8 @@ extern int show_line_range(struct line_range *lr, const char *module);
    extern int show_available_vars(struct perf_probe_event *pevs, int npevs,
    int max_probe_points, const char *module,
    struct strfilter *filter, bool externs);
    -extern int show_available_funcs(const char *module, struct strfilter *filter);
    -
    +extern int show_available_funcs(const char *module, struct strfilter *filter,
    + bool user);

    /* Maximum index number of event-name postfix */
    #define MAX_EVENT_INDEX 1024


    \
     
     \ /
      Last update: 2011-11-10 20:09    [W:0.030 / U:0.932 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site