leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libperf: Move perf's cpu_map__idx() to perf_cpu_map__idx()

Browse Source 
As an internal function that will be used by both perf and libperf, but
is not exported at this point.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190822111141.25823-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-08-22 13:11:40 +02:00 committed by Arnaldo Carvalho de Melo
parent 315c0a1f0c
commit b4df75de3b
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/lib/cpumap.c
View File

@ -242,3 +242,15 @@ bool perf_cpu_map__empty(const struct perf_cpu_map *map)
{ {
return map ? map->map[0] == -1 : true; 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;
}

2
tools/perf/lib/include/internal/cpumap.h
View File

@ -14,4 +14,6 @@ struct perf_cpu_map {
#define MAX_NR_CPUS 2048 #define MAX_NR_CPUS 2048
#endif #endif
int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu);
#endif /* __LIBPERF_INTERNAL_CPUMAP_H */ #endif /* __LIBPERF_INTERNAL_CPUMAP_H */

14
tools/perf/util/cpumap.c
View File

@ -458,19 +458,7 @@ int cpu__setup_cpunode_map(void)
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu) bool cpu_map__has(struct perf_cpu_map *cpus, int cpu)
{ {
return cpu_map__idx(cpus, cpu) != -1; return perf_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;
} }
int cpu_map__cpu(struct perf_cpu_map *cpus, int idx) int cpu_map__cpu(struct perf_cpu_map *cpus, int idx)

1
tools/perf/util/cpumap.h
View File

@ -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); int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu); 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 */ #endif /* __PERF_CPUMAP_H */

2
tools/perf/util/evlist.c
View File

@ -758,7 +758,7 @@ static int perf_evlist__mmap_per_evsel(struct evlist *evlist, int idx,
if (evsel->system_wide && thread) if (evsel->system_wide && thread)
continue; continue;
cpu = cpu_map__idx(evsel->core.cpus, evlist_cpu); cpu = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
if (cpu == -1) if (cpu == -1)
continue; continue;