lkml.org 
[lkml]   [2018]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf stat: Add 'struct perf_evlist' argument to perf_stat_synthesize_config()
    Commit-ID:  1c21e9899d6a9ea72d4d678faa7b0ec22bcf59a9
    Gitweb: https://git.kernel.org/tip/1c21e9899d6a9ea72d4d678faa7b0ec22bcf59a9
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Thu, 30 Aug 2018 08:32:21 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Thu, 30 Aug 2018 15:52:22 -0300

    perf stat: Add 'struct perf_evlist' argument to perf_stat_synthesize_config()

    Get rid of the 'evsel_list' global variable dependency, here in
    perf_stat_synthesize_config() we are adding the 'evlist' arg.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20180830063252.23729-13-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-stat.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
    index ae5029875e87..cb36344c25b7 100644
    --- a/tools/perf/builtin-stat.c
    +++ b/tools/perf/builtin-stat.c
    @@ -404,12 +404,13 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf

    static int perf_stat_synthesize_config(struct perf_stat_config *config,
    struct perf_tool *tool,
    + struct perf_evlist *evlist,
    bool attrs)
    {
    int err;

    if (attrs) {
    - err = perf_event__synthesize_attrs(tool, evsel_list,
    + err = perf_event__synthesize_attrs(tool, evlist,
    process_synthesized_event);
    if (err < 0) {
    pr_err("Couldn't synthesize attrs.\n");
    @@ -417,12 +418,11 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config,
    }
    }

    - err = perf_event__synthesize_extra_attr(tool,
    - evsel_list,
    + err = perf_event__synthesize_extra_attr(tool, evlist,
    process_synthesized_event,
    attrs);

    - err = perf_event__synthesize_thread_map2(tool, evsel_list->threads,
    + err = perf_event__synthesize_thread_map2(tool, evlist->threads,
    process_synthesized_event,
    NULL);
    if (err < 0) {
    @@ -430,7 +430,7 @@ static int perf_stat_synthesize_config(struct perf_stat_config *config,
    return err;
    }

    - err = perf_event__synthesize_cpu_map(tool, evsel_list->cpus,
    + err = perf_event__synthesize_cpu_map(tool, evlist->cpus,
    process_synthesized_event, NULL);
    if (err < 0) {
    pr_err("Couldn't synthesize thread map.\n");
    @@ -608,7 +608,8 @@ try_again:
    if (err < 0)
    return err;

    - err = perf_stat_synthesize_config(&stat_config, NULL, is_pipe);
    + err = perf_stat_synthesize_config(&stat_config, NULL, evsel_list,
    + is_pipe);
    if (err < 0)
    return err;
    }
    \
     
     \ /
      Last update: 2018-09-06 15:28    [W:3.885 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site