lkml.org 
[lkml]   [2021]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 31/48] perf stat: Use perf_cpu_map__for_each_cpu
    From
    Correct in print_counter where an index was being used as a cpu.

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/util/stat-display.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
    index 7e933a8fee68..0f192360b6c6 100644
    --- a/tools/perf/util/stat-display.c
    +++ b/tools/perf/util/stat-display.c
    @@ -4,6 +4,7 @@
    #include <linux/string.h>
    #include <linux/time64.h>
    #include <math.h>
    +#include <perf/cpumap.h>
    #include "color.h"
    #include "counts.h"
    #include "evlist.h"
    @@ -732,7 +733,7 @@ static void print_aggr(struct perf_stat_config *config,
    evlist__for_each_entry(evlist, counter) {
    print_counter_aggrdata(config, counter, s,
    prefix, metric_only,
    - &first, -1);
    + &first, /*cpu=*/-1);
    }
    if (metric_only)
    fputc('\n', output);
    @@ -893,11 +894,11 @@ static void print_counter(struct perf_stat_config *config,
    FILE *output = config->output;
    u64 ena, run, val;
    double uval;
    - int cpu;
    + int idx, cpu;
    struct aggr_cpu_id id;

    - for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) {
    - struct aggr_data ad = { .cpu_map_idx = cpu };
    + perf_cpu_map__for_each_cpu(cpu, idx, evsel__cpus(counter)) {
    + struct aggr_data ad = { .cpu_map_idx = idx };

    if (!collect_data(config, counter, counter_cb, &ad))
    return;
    @@ -1248,7 +1249,7 @@ static void print_percore(struct perf_stat_config *config,

    print_counter_aggrdata(config, counter, s,
    prefix, metric_only,
    - &first, -1);
    + &first, /*cpu=*/-1);
    }

    if (metric_only)
    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2021-12-30 08:23    [W:4.152 / U:0.884 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site