lkml.org 
[lkml]   [2022]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v4 06/48] perf cpumap: Switch cpu_map__build_map to cpu function
    From
    Avoid error prone cpu_map + idx variant. Remove now unused functions.

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

    diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
    index 9791ae9b1a53..6b985abaa2d2 100644
    --- a/tools/perf/builtin-stat.c
    +++ b/tools/perf/builtin-stat.c
    @@ -1504,11 +1504,6 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx, void *data)
    -{
    - return perf_env__get_socket_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data);
    -}
    -
    static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data)
    {
    struct perf_env *env = data;
    @@ -1527,11 +1522,6 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, void *data)
    -{
    - return perf_env__get_die_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data);
    -}
    -
    static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data)
    {
    struct perf_env *env = data;
    @@ -1551,11 +1541,6 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, void *data)
    -{
    - return perf_env__get_core_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data);
    -}
    -
    static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data)
    {
    struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();
    @@ -1564,33 +1549,28 @@ static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data)
    return id;
    }

    -static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, void *data)
    -{
    - return perf_env__get_node_aggr_by_cpu(perf_env__get_cpu(data, map, idx), data);
    -}
    -
    static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus,
    struct cpu_aggr_map **sockp)
    {
    - return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env);
    + return cpu_map__build_map(cpus, sockp, perf_env__get_socket_aggr_by_cpu, env);
    }

    static int perf_env__build_die_map(struct perf_env *env, struct perf_cpu_map *cpus,
    struct cpu_aggr_map **diep)
    {
    - return cpu_map__build_map(cpus, diep, perf_env__get_die, env);
    + return cpu_map__build_map(cpus, diep, perf_env__get_die_aggr_by_cpu, env);
    }

    static int perf_env__build_core_map(struct perf_env *env, struct perf_cpu_map *cpus,
    struct cpu_aggr_map **corep)
    {
    - return cpu_map__build_map(cpus, corep, perf_env__get_core, env);
    + return cpu_map__build_map(cpus, corep, perf_env__get_core_aggr_by_cpu, env);
    }

    static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus,
    struct cpu_aggr_map **nodep)
    {
    - return cpu_map__build_map(cpus, nodep, perf_env__get_node, env);
    + return cpu_map__build_map(cpus, nodep, perf_env__get_node_aggr_by_cpu, env);
    }

    static struct aggr_cpu_id perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused,
    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index 49fba2c53822..feaf34b25efc 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -163,7 +163,7 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
    }

    int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data),
    + struct aggr_cpu_id (*f)(int cpu, void *data),
    void *data)
    {
    int nr = cpus->nr;
    @@ -178,7 +178,7 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    c->nr = 0;

    for (cpu = 0; cpu < nr; cpu++) {
    - s1 = f(cpus, cpu, data);
    + s1 = f(cpu, data);
    for (s2 = 0; s2 < c->nr; s2++) {
    if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2]))
    break;
    @@ -290,22 +290,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da

    int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp)
    {
    - return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL);
    + return cpu_map__build_map(cpus, sockp, cpu_map__get_socket_aggr_by_cpu, NULL);
    }

    int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep)
    {
    - return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL);
    + return cpu_map__build_map(cpus, diep, cpu_map__get_die_aggr_by_cpu, NULL);
    }

    int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep)
    {
    - return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL);
    + return cpu_map__build_map(cpus, corep, cpu_map__get_core_aggr_by_cpu, NULL);
    }

    int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap)
    {
    - return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL);
    + return cpu_map__build_map(cpus, numap, cpu_map__get_node_aggr_by_cpu, NULL);
    }

    /* setup simple routines to easily access node numbers given a cpu number */
    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index c62d67704425..9648816c4255 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -63,7 +63,7 @@ int cpu__max_present_cpu(void);
    int cpu__get_node(int cpu);

    int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    - struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data),
    + struct aggr_cpu_id (*f)(int cpu, void *data),
    void *data);

    int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2022-01-05 07:14    [W:4.029 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site