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 15/48] perf cpumap: Document cpu__get_node and remove redundant function
    From
    cpu_map__get_node_id isn't used externally and merely delegates to
    cpu__get_node.

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

    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index b3e1304aca0c..1626b0991408 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -16,6 +16,10 @@
    static int max_cpu_num;
    static int max_present_cpu_num;
    static int max_node_num;
    +/**
    + * The numa node X as read from /sys/devices/system/node/nodeX indexed by the
    + * CPU number.
    + */
    static int *cpunode_map;

    static struct perf_cpu_map *cpu_map__from_entries(struct cpu_map_entries *cpus)
    @@ -222,11 +226,6 @@ int cpu_map__get_core_id(int cpu)
    return ret ?: value;
    }

    -int cpu_map__get_node_id(int cpu)
    -{
    - return cpu__get_node(cpu);
    -}
    -
    struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data)
    {
    struct aggr_cpu_id id;
    @@ -250,7 +249,7 @@ struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unu
    {
    struct aggr_cpu_id id = aggr_cpu_id__empty();

    - id.node = cpu_map__get_node_id(cpu);
    + id.node = cpu__get_node(cpu);
    return id;
    }

    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index 9589b0001a28..f849f01c5860 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -45,7 +45,6 @@ int cpu_map__get_die_id(int cpu);
    struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data);
    int cpu_map__get_core_id(int cpu);
    struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data);
    -int cpu_map__get_node_id(int cpu);
    struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data);
    int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp);
    int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep);
    @@ -58,6 +57,10 @@ int cpu__setup_cpunode_map(void);
    int cpu__max_node(void);
    int cpu__max_cpu(void);
    int cpu__max_present_cpu(void);
    +/**
    + * cpu__get_node - Returns the numa node X as read from
    + * /sys/devices/system/node/nodeX for the given CPU.
    + */
    int cpu__get_node(int cpu);

    int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2021-12-30 08:22    [W:4.205 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site