lkml.org 
[lkml]   [2015]   [Sep]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V3 12/14] perf tools: Fix perf_evlist__create_syswide_maps() not propagating maps
    Date
    Fix it by making it call perf_evlist__set_maps() instead of
    setting the maps itself.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/util/evlist.c | 19 ++++++++++---------
    1 file changed, 10 insertions(+), 9 deletions(-)

    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index 99267ab0d24a..c8fc8a258f42 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -1400,6 +1400,8 @@ void perf_evlist__close(struct perf_evlist *evlist)

    static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
    {
    + struct cpu_map *cpus;
    + struct thread_map *threads;
    int err = -ENOMEM;

    /*
    @@ -1411,20 +1413,19 @@ static int perf_evlist__create_syswide_maps(struct perf_evlist *evlist)
    * error, and we may not want to do that fallback to a
    * default cpu identity map :-\
    */
    - evlist->cpus = cpu_map__new(NULL);
    - if (evlist->cpus == NULL)
    + cpus = cpu_map__new(NULL);
    + if (!cpus)
    goto out;

    - evlist->threads = thread_map__new_dummy();
    - if (evlist->threads == NULL)
    - goto out_free_cpus;
    + threads = thread_map__new_dummy();
    + if (!threads)
    + goto out_put;

    - err = 0;
    + perf_evlist__set_maps(evlist, cpus, threads);
    out:
    return err;
    -out_free_cpus:
    - cpu_map__put(evlist->cpus);
    - evlist->cpus = NULL;
    +out_put:
    + cpu_map__put(cpus);
    goto out;
    }

    --
    1.9.1


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