lkml.org 
[lkml]   [2021]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 37/48] perf evsel: Rename CPU around get_group_fd
    From
    CPU is really a cpu map index, change names to make code more intention
    revealing.

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

    diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
    index b4a2c5034cfe..4b3ba4408af2 100644
    --- a/tools/perf/util/evsel.c
    +++ b/tools/perf/util/evsel.c
    @@ -1591,27 +1591,27 @@ int __evsel__read_on_cpu(struct evsel *evsel, int cpu_map_idx, int thread, bool
    }

    static int evsel__match_other_cpu(struct evsel *evsel, struct evsel *other,
    - int cpu)
    + int cpu_map_idx)
    {
    - int cpuid;
    + int cpu;

    - cpuid = perf_cpu_map__cpu(evsel->core.cpus, cpu);
    - return perf_cpu_map__idx(other->core.cpus, cpuid);
    + cpu = perf_cpu_map__cpu(evsel->core.cpus, cpu_map_idx);
    + return perf_cpu_map__idx(other->core.cpus, cpu);
    }

    -static int evsel__hybrid_group_cpu(struct evsel *evsel, int cpu)
    +static int evsel__hybrid_group_cpu_map_idx(struct evsel *evsel, int cpu_map_idx)
    {
    struct evsel *leader = evsel__leader(evsel);

    if ((evsel__is_hybrid(evsel) && !evsel__is_hybrid(leader)) ||
    (!evsel__is_hybrid(evsel) && evsel__is_hybrid(leader))) {
    - return evsel__match_other_cpu(evsel, leader, cpu);
    + return evsel__match_other_cpu(evsel, leader, cpu_map_idx);
    }

    - return cpu;
    + return cpu_map_idx;
    }

    -static int get_group_fd(struct evsel *evsel, int cpu, int thread)
    +static int get_group_fd(struct evsel *evsel, int cpu_map_idx, int thread)
    {
    struct evsel *leader = evsel__leader(evsel);
    int fd;
    @@ -1625,11 +1625,11 @@ static int get_group_fd(struct evsel *evsel, int cpu, int thread)
    */
    BUG_ON(!leader->core.fd);

    - cpu = evsel__hybrid_group_cpu(evsel, cpu);
    - if (cpu == -1)
    + cpu_map_idx = evsel__hybrid_group_cpu_map_idx(evsel, cpu_map_idx);
    + if (cpu_map_idx == -1)
    return -1;

    - fd = FD(leader, cpu, thread);
    + fd = FD(leader, cpu_map_idx, thread);
    BUG_ON(fd == -1);

    return fd;
    --
    2.34.1.307.g9b7440fafd-goog
    \
     
     \ /
      Last update: 2021-12-23 08:49    [W:5.883 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site