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 13/48] perf cpumap: Simplify equal function name.
    From
    Rename cpu_map__compare_aggr_cpu_id to aggr_cpu_id__equal, the cpu_map
    part of the name is misleading. Equal better describes the function than
    compare.
    Switch to const pointer rather than value as struct given the number of
    variables in aggr_cpu_id.

    Reviewed-by: James Clark <james.clark@arm.com>
    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/util/cpumap.c | 14 +++++++-------
    tools/perf/util/cpumap.h | 2 +-
    tools/perf/util/stat-display.c | 18 ++++++++++--------
    3 files changed, 18 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index f67b2e7aac13..8fa00a6221c8 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -171,7 +171,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    for (cpu = 0; cpu < nr; cpu++) {
    s1 = f(cpu, data);
    for (s2 = 0; s2 < c->nr; s2++) {
    - if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2]))
    + if (aggr_cpu_id__equal(&s1, &c->map[s2]))
    break;
    }
    if (s2 == c->nr) {
    @@ -593,13 +593,13 @@ const struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */
    return online;
    }

    -bool cpu_map__compare_aggr_cpu_id(struct aggr_cpu_id a, struct aggr_cpu_id b)
    +bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b)
    {
    - return a.thread == b.thread &&
    - a.node == b.node &&
    - a.socket == b.socket &&
    - a.die == b.die &&
    - a.core == b.core;
    + return a->thread == b->thread &&
    + a->node == b->node &&
    + a->socket == b->socket &&
    + a->die == b->die &&
    + a->core == b->core;
    }

    bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)
    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index 22e53fd54657..652b76c69376 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -67,7 +67,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
    bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);

    -bool cpu_map__compare_aggr_cpu_id(struct aggr_cpu_id a, struct aggr_cpu_id b);
    +bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b);
    bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a);
    struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void);

    diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
    index 6c40b91d5e32..0241436bb1fb 100644
    --- a/tools/perf/util/stat-display.c
    +++ b/tools/perf/util/stat-display.c
    @@ -328,20 +328,22 @@ static void print_metric_header(struct perf_stat_config *config,
    }

    static int first_shadow_cpu(struct perf_stat_config *config,
    - struct evsel *evsel, struct aggr_cpu_id id)
    + struct evsel *evsel, const struct aggr_cpu_id *id)
    {
    struct perf_cpu_map *cpus;
    int cpu, idx;

    if (config->aggr_mode == AGGR_NONE)
    - return id.core;
    + return id->core;

    if (!config->aggr_get_id)
    return 0;

    cpus = evsel__cpus(evsel);
    perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
    - if (cpu_map__compare_aggr_cpu_id(config->aggr_get_id(config, cpu), id))
    + struct aggr_cpu_id cpu_id = config->aggr_get_id(config, cpu);
    +
    + if (aggr_cpu_id__equal(&cpu_id, id))
    return cpu;
    }
    return 0;
    @@ -501,7 +503,7 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int
    }

    perf_stat__print_shadow_stats(config, counter, uval,
    - first_shadow_cpu(config, counter, id),
    + first_shadow_cpu(config, counter, &id),
    &out, &config->metric_events, st);
    if (!config->csv_output && !config->metric_only) {
    print_noise(config, counter, noise);
    @@ -525,12 +527,12 @@ static void aggr_update_shadow(struct perf_stat_config *config,
    val = 0;
    perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
    s2 = config->aggr_get_id(config, cpu);
    - if (!cpu_map__compare_aggr_cpu_id(s2, id))
    + if (!aggr_cpu_id__equal(&s2, &id))
    continue;
    val += perf_counts(counter->counts, idx, 0)->val;
    }
    perf_stat__update_shadow_stats(counter, val,
    - first_shadow_cpu(config, counter, id),
    + first_shadow_cpu(config, counter, &id),
    &rt_stat);
    }
    }
    @@ -641,7 +643,7 @@ static void aggr_cb(struct perf_stat_config *config,
    struct perf_counts_values *counts;

    s2 = config->aggr_get_id(config, cpu);
    - if (!cpu_map__compare_aggr_cpu_id(s2, ad->id))
    + if (!aggr_cpu_id__equal(&s2, &ad->id))
    continue;
    if (first)
    ad->nr++;
    @@ -1217,7 +1219,7 @@ static void print_percore_thread(struct perf_stat_config *config,
    s2 = config->aggr_get_id(config, cpu);
    for (s = 0; s < config->aggr_map->nr; s++) {
    id = config->aggr_map->map[s];
    - if (cpu_map__compare_aggr_cpu_id(s2, id))
    + if (aggr_cpu_id__equal(&s2, &id))
    break;
    }

    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2021-12-30 08:22    [W:4.109 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site