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 13/14] perf tools: Fix task exit test setting maps
    Date
    The test titled "Test number of exit event of a simple workload"
    was setting cpu/thread maps directly. Make it use the proper
    function perf_evlist__set_maps() especially now that it also
    propagates the maps.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/tests/task-exit.c | 18 ++++++++++++++----
    1 file changed, 14 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
    index 3a8fedef83bc..add16385f13e 100644
    --- a/tools/perf/tests/task-exit.c
    +++ b/tools/perf/tests/task-exit.c
    @@ -43,6 +43,8 @@ int test__task_exit(void)
    };
    const char *argv[] = { "true", NULL };
    char sbuf[STRERR_BUFSIZE];
    + struct cpu_map *cpus;
    + struct thread_map *threads;

    signal(SIGCHLD, sig_handler);

    @@ -58,14 +60,19 @@ int test__task_exit(void)
    * perf_evlist__prepare_workload we'll fill in the only thread
    * we're monitoring, the one forked there.
    */
    - evlist->cpus = cpu_map__dummy_new();
    - evlist->threads = thread_map__new_by_tid(-1);
    - if (!evlist->cpus || !evlist->threads) {
    + cpus = cpu_map__dummy_new();
    + threads = thread_map__new_by_tid(-1);
    + if (!cpus || !threads) {
    err = -ENOMEM;
    pr_debug("Not enough memory to create thread/cpu maps\n");
    - goto out_delete_evlist;
    + goto out_free_maps;
    }

    + perf_evlist__set_maps(evlist, cpus, threads);
    +
    + cpus = NULL;
    + threads = NULL;
    +
    err = perf_evlist__prepare_workload(evlist, &target, argv, false,
    workload_exec_failed_signal);
    if (err < 0) {
    @@ -114,6 +121,9 @@ retry:
    err = -1;
    }

    +out_free_maps:
    + cpu_map__put(cpus);
    + thread_map__put(threads);
    out_delete_evlist:
    perf_evlist__delete(evlist);
    return err;
    --
    1.9.1


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