lkml.org 
[lkml]   [2011]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v3 2.6.39-rc1-tip 22/26] 22: perf: rename target_module to target
    (2011/04/01 23:36), Srikar Dronamraju wrote:
    > This is a precursor patch that modifies names that refer to kernel/module
    > to also refer to user space names.
    >
    > Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
    > ---
    > tools/perf/builtin-probe.c | 12 ++++++------
    > tools/perf/util/probe-event.c | 6 +++---
    > 2 files changed, 9 insertions(+), 9 deletions(-)
    >
    > diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
    > index 2c0e64d..98db08f 100644
    > --- a/tools/perf/builtin-probe.c
    > +++ b/tools/perf/builtin-probe.c
    > @@ -61,7 +61,7 @@ static struct {
    > struct perf_probe_event events[MAX_PROBES];
    > struct strlist *dellist;
    > struct line_range line_range;
    > - const char *target_module;
    > + const char *target;
    > int max_probe_points;
    > struct strfilter *filter;
    > } params;
    > @@ -241,7 +241,7 @@ static const struct option options[] = {
    > "file", "vmlinux pathname"),
    > OPT_STRING('s', "source", &symbol_conf.source_prefix,
    > "directory", "path to kernel source"),
    > - OPT_STRING('m', "module", &params.target_module,
    > + OPT_STRING('m', "module", &params.target,
    > "modname", "target module name"),
    > #endif
    > OPT__DRY_RUN(&probe_event_dry_run),
    > @@ -327,7 +327,7 @@ 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_module,
    > + ret = show_available_funcs(params.target,
    > params.filter);
    > strfilter__delete(params.filter);
    > if (ret < 0)
    > @@ -348,7 +348,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
    > usage_with_options(probe_usage, options);
    > }
    >
    > - ret = show_line_range(&params.line_range, params.target_module);
    > + ret = show_line_range(&params.line_range, params.target);
    > if (ret < 0)
    > pr_err(" Error: Failed to show lines. (%d)\n", ret);
    > return ret;
    > @@ -365,7 +365,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
    >
    > ret = show_available_vars(params.events, params.nevents,
    > params.max_probe_points,
    > - params.target_module,
    > + params.target,
    > params.filter,
    > params.show_ext_vars);
    > strfilter__delete(params.filter);
    > @@ -387,7 +387,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
    > if (params.nevents) {
    > ret = add_perf_probe_events(params.events, params.nevents,
    > params.max_probe_points,
    > - params.target_module,
    > + params.target,
    > params.force_add);
    > if (ret < 0) {
    > pr_err(" Error: Failed to add events. (%d)\n", ret);
    > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
    > index 5ddee66..09c53c1 100644
    > --- a/tools/perf/util/probe-event.c
    > +++ b/tools/perf/util/probe-event.c
    > @@ -1979,7 +1979,7 @@ static int filter_available_functions(struct map *map __unused,
    > return 1;
    > }
    >
    > -int show_available_funcs(const char *module, struct strfilter *_filter)
    > +int show_available_funcs(const char *elfobject, struct strfilter *_filter)
    > {
    > struct map *map;
    > int ret;
    > @@ -1990,9 +1990,9 @@ int show_available_funcs(const char *module, struct strfilter *_filter)
    > if (ret < 0)
    > return ret;
    >
    > - map = kernel_get_module_map(module);
    > + map = kernel_get_module_map(elfobject);
    > if (!map) {
    > - pr_err("Failed to find %s map.\n", (module) ? : "kernel");
    > + pr_err("Failed to find %s map.\n", (elfobject) ? : "kernel");

    Hmm, these changes(module -> elfobject) are put back by the next patch.
    Could you check your patch stack?

    Thank you,

    --
    Masami HIRAMATSU
    Software Platform Research Dept. Linux Technology Center
    Hitachi, Ltd., Yokohama Research Laboratory
    E-mail: masami.hiramatsu.pt@hitachi.com


    \
     
     \ /
      Last update: 2011-04-04 12:09    [W:0.032 / U:0.256 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site