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 17/48] perf cpumap: Remove cpu_map__cpu, use libperf function.
    From
    Switch the remaining few users of cpu_map__cpu to perf_cpu_map__cpu and
    remove the function.

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

    diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
    index 2b54e2ddc80a..f16c39a37a52 100644
    --- a/tools/perf/builtin-ftrace.c
    +++ b/tools/perf/builtin-ftrace.c
    @@ -281,7 +281,7 @@ static int set_tracing_cpumask(struct perf_cpu_map *cpumap)
    int ret;
    int last_cpu;

    - last_cpu = cpu_map__cpu(cpumap, cpumap->nr - 1);
    + last_cpu = perf_cpu_map__cpu(cpumap, cpumap->nr - 1);
    mask_size = last_cpu / 4 + 2; /* one more byte for EOS */
    mask_size += last_cpu / 32; /* ',' is needed for every 32th cpus */

    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index e0d7f1da5858..32f9fc2dd389 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -485,11 +485,6 @@ bool cpu_map__has(struct perf_cpu_map *cpus, int cpu)
    return perf_cpu_map__idx(cpus, cpu) != -1;
    }

    -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx)
    -{
    - return cpus->map[idx];
    -}
    -
    size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size)
    {
    int i, cpu, start = -1;
    @@ -547,7 +542,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size)
    int i, cpu;
    char *ptr = buf;
    unsigned char *bitmap;
    - int last_cpu = cpu_map__cpu(map, map->nr - 1);
    + int last_cpu = perf_cpu_map__cpu(map, map->nr - 1);

    if (buf == NULL)
    return 0;
    @@ -559,7 +554,7 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size)
    }

    for (i = 0; i < map->nr; i++) {
    - cpu = cpu_map__cpu(map, i);
    + cpu = perf_cpu_map__cpu(map, i);
    bitmap[cpu / 8] |= 1 << (cpu % 8);
    }

    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index a053bf31a3f0..87545bcd461d 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -80,7 +80,6 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
    struct aggr_cpu_id (*f)(int cpu, void *data),
    void *data);

    -int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
    bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);

    bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b);
    --
    2.34.1.448.ga2b2bfdf31-goog
    \
     
     \ /
      Last update: 2022-01-05 07:15    [W:4.599 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site