lkml.org 
[lkml]   [2019]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/5] libperf: Move cpu_map__idx to perf_cpu_map__idx
    Date
    As an internal function that will be used by both
    perf and libperf, but is not exported at this point.

    Link: http://lkml.kernel.org/n/tip-wa4bngnci9395p6xk0nfmj9h@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/lib/cpumap.c | 12 ++++++++++++
    tools/perf/lib/include/internal/cpumap.h | 2 ++
    tools/perf/util/cpumap.c | 14 +-------------
    tools/perf/util/cpumap.h | 1 -
    tools/perf/util/evlist.c | 2 +-
    5 files changed, 16 insertions(+), 15 deletions(-)

    diff --git a/tools/perf/lib/cpumap.c b/tools/perf/lib/cpumap.c
    index 63f7df7e47ff..2834753576b2 100644
    --- a/tools/perf/lib/cpumap.c
    +++ b/tools/perf/lib/cpumap.c
    @@ -242,3 +242,15 @@ bool perf_cpu_map__empty(const struct perf_cpu_map *map)
    {
    return map ? map->map[0] == -1 : true;
    }
    +
    +int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
    +{
    + int i;
    +
    + for (i = 0; i < cpus->nr; ++i) {
    + if (cpus->map[i] == cpu)
    + return i;
    + }
    +
    + return -1;
    +}
    diff --git a/tools/perf/lib/include/internal/cpumap.h b/tools/perf/lib/include/internal/cpumap.h
    index 3306319f7df8..840d4032587b 100644
    --- a/tools/perf/lib/include/internal/cpumap.h
    +++ b/tools/perf/lib/include/internal/cpumap.h
    @@ -14,4 +14,6 @@ struct perf_cpu_map {
    #define MAX_NR_CPUS 2048
    #endif

    +int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
    +
    #endif /* __LIBPERF_INTERNAL_CPUMAP_H */
    diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
    index 4402e67445a4..8e6c2cbffedc 100644
    --- a/tools/perf/util/cpumap.c
    +++ b/tools/perf/util/cpumap.c
    @@ -458,19 +458,7 @@ int cpu__setup_cpunode_map(void)

    bool cpu_map__has(struct perf_cpu_map *cpus, int cpu)
    {
    - return cpu_map__idx(cpus, cpu) != -1;
    -}
    -
    -int cpu_map__idx(struct perf_cpu_map *cpus, int cpu)
    -{
    - int i;
    -
    - for (i = 0; i < cpus->nr; ++i) {
    - if (cpus->map[i] == cpu)
    - return i;
    - }
    -
    - return -1;
    + return perf_cpu_map__idx(cpus, cpu) != -1;
    }

    int cpu_map__cpu(struct perf_cpu_map *cpus, int idx)
    diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
    index 3e068090612f..8dbedda7af45 100644
    --- a/tools/perf/util/cpumap.h
    +++ b/tools/perf/util/cpumap.h
    @@ -62,5 +62,4 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,

    int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
    bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);
    -int cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
    #endif /* __PERF_CPUMAP_H */
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index ba49b5ecffd0..8582560b59af 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -758,7 +758,7 @@ static int perf_evlist__mmap_per_evsel(struct evlist *evlist, int idx,
    if (evsel->system_wide && thread)
    continue;

    - cpu = cpu_map__idx(evsel->core.cpus, evlist_cpu);
    + cpu = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
    if (cpu == -1)
    continue;

    --
    2.21.0
    \
     
     \ /
      Last update: 2019-08-22 13:13    [W:8.238 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site