Commit b4df75de authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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



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

Signed-off-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 315c0a1f

tools/perf/lib/cpumap.c

+12 −0
Original line number Diff line number Diff line
@@ -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;

}

tools/perf/lib/include/internal/cpumap.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

tools/perf/util/cpumap.c

+1 −13
Original line number Diff line number Diff line
@@ -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)

tools/perf/util/cpumap.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE