lkml.org 
[lkml]   [2010]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/9] perf symbols: Split helpers used when creating kernel dso object
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    To make it clear and allow for direct usage by, for instance, regression
    test suites.

    Cc: Frédéric Weisbecker <fweisbec@gmail.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/symbol.c | 28 +++++++++++++++++++++-------
    tools/perf/util/symbol.h | 2 ++
    2 files changed, 23 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
    index 26ec603..f9049d1 100644
    --- a/tools/perf/util/symbol.c
    +++ b/tools/perf/util/symbol.c
    @@ -1762,24 +1762,38 @@ size_t dsos__fprintf_buildid(FILE *fp, bool with_hits)
    __dsos__fprintf_buildid(&dsos__user, fp, with_hits));
    }

    +struct dso *dso__new_kernel(const char *name)
    +{
    + struct dso *self = dso__new(name ?: "[kernel.kallsyms]");
    +
    + if (self != NULL) {
    + self->short_name = "[kernel]";
    + self->kernel = 1;
    + }
    +
    + return self;
    +}
    +
    +void dso__read_running_kernel_build_id(struct dso *self)
    +{
    + if (sysfs__read_build_id("/sys/kernel/notes", self->build_id,
    + sizeof(self->build_id)) == 0)
    + self->has_build_id = true;
    +}
    +
    static struct dso *dsos__create_kernel(const char *vmlinux)
    {
    - struct dso *kernel = dso__new(vmlinux ?: "[kernel.kallsyms]");
    + struct dso *kernel = dso__new_kernel(vmlinux);

    if (kernel == NULL)
    return NULL;

    - kernel->short_name = "[kernel]";
    - kernel->kernel = 1;
    -
    vdso = dso__new("[vdso]");
    if (vdso == NULL)
    goto out_delete_kernel_dso;
    dso__set_loaded(vdso, MAP__FUNCTION);

    - if (sysfs__read_build_id("/sys/kernel/notes", kernel->build_id,
    - sizeof(kernel->build_id)) == 0)
    - kernel->has_build_id = true;
    + dso__read_running_kernel_build_id(kernel);

    dsos__add(&dsos__kernel, kernel);
    dsos__add(&dsos__user, vdso);
    diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
    index a94997a..1243027 100644
    --- a/tools/perf/util/symbol.h
    +++ b/tools/perf/util/symbol.h
    @@ -109,6 +109,7 @@ struct dso {
    };

    struct dso *dso__new(const char *name);
    +struct dso *dso__new_kernel(const char *name);
    void dso__delete(struct dso *self);

    bool dso__loaded(const struct dso *self, enum map_type type);
    @@ -139,6 +140,7 @@ size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp);
    char dso__symtab_origin(const struct dso *self);
    void dso__set_long_name(struct dso *self, char *name);
    void dso__set_build_id(struct dso *self, void *build_id);
    +void dso__read_running_kernel_build_id(struct dso *self);
    struct symbol *dso__find_symbol(struct dso *self, enum map_type type, u64 addr);
    struct symbol *dso__find_symbol_by_name(struct dso *self, enum map_type type,
    const char *name);
    --
    1.6.2.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-01-28 00:11    [W:2.732 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site