lkml.org 
[lkml]   [2018]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/13] perf tools: Store compression id into struct dso
    Date
    Adding comp into struct dso to hold the compression index.
    It will be used in following patches.

    Link: http://lkml.kernel.org/n/tip-84cxf8bbc0etndwzrzqxxi2d@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/util/dso.c | 5 ++++-
    tools/perf/util/dso.h | 1 +
    tools/perf/util/machine.c | 4 +++-
    3 files changed, 8 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
    index f5f8babea17c..f0e4cc43c97e 100644
    --- a/tools/perf/util/dso.c
    +++ b/tools/perf/util/dso.c
    @@ -418,8 +418,10 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,
    dso->symtab_type = DSO_BINARY_TYPE__GUEST_KMODULE;

    /* _KMODULE_COMP should be next to _KMODULE */
    - if (m->kmod && m->comp)
    + if (m->kmod && m->comp) {
    dso->symtab_type++;
    + dso->comp = m->comp;
    + }

    dso__set_short_name(dso, strdup(m->name), true);
    }
    @@ -1225,6 +1227,7 @@ struct dso *dso__new(const char *name)
    dso->a2l_fails = 1;
    dso->kernel = DSO_TYPE_USER;
    dso->needs_swap = DSO_SWAP__UNSET;
    + dso->comp = COMP_ID__NONE;
    RB_CLEAR_NODE(&dso->rb_node);
    dso->root = NULL;
    INIT_LIST_HEAD(&dso->node);
    diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
    index 7bde23f6e5a9..a6c7af52115f 100644
    --- a/tools/perf/util/dso.h
    +++ b/tools/perf/util/dso.h
    @@ -175,6 +175,7 @@ struct dso {
    u16 short_name_len;
    void *dwfl; /* DWARF debug info */
    struct auxtrace_cache *auxtrace_cache;
    + int comp;

    /* dso data file */
    struct {
    diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
    index b300a3973448..c4acd2001db0 100644
    --- a/tools/perf/util/machine.c
    +++ b/tools/perf/util/machine.c
    @@ -1212,8 +1212,10 @@ static int map_groups__set_module_path(struct map_groups *mg, const char *path,
    * Full name could reveal us kmod compression, so
    * we need to update the symtab_type if needed.
    */
    - if (m->comp && is_kmod_dso(map->dso))
    + if (m->comp && is_kmod_dso(map->dso)) {
    map->dso->symtab_type++;
    + map->dso->comp = m->comp;
    + }

    return 0;
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-17 11:49    [W:4.185 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site