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

libperf: Adopt perf_cpu_map__max() function 



From 'perf stat', so that it can be used from multiple places.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20190902121255.536-2-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 227cb129

tools/perf/builtin-stat.c

+1 −13
Original line number Diff line number Diff line
@@ -822,18 +822,6 @@ static int perf_stat__get_core(struct perf_stat_config *config __maybe_unused, 
	return cpu_map__get_core(map, cpu, NULL);

}



static int cpu_map__get_max(struct perf_cpu_map *map)

{

	int i, max = -1;



	for (i = 0; i < map->nr; i++) {

		if (map->map[i] > max)

			max = map->map[i];

	}



	return max;

}



static int perf_stat__get_aggr(struct perf_stat_config *config,

			       aggr_get_id_t get_id, struct perf_cpu_map *map, int idx)

{
@@ -928,7 +916,7 @@ static int perf_stat_init_aggr_mode(void) 
	 * taking the highest cpu number to be the size of

	 * the aggregation translate cpumap.

	 */

	nr = cpu_map__get_max(evsel_list->core.cpus);

	nr = perf_cpu_map__max(evsel_list->core.cpus);

	stat_config.cpus_aggr_map = perf_cpu_map__empty_new(nr + 1);

	return stat_config.cpus_aggr_map ? 0 : -ENOMEM;

}

tools/perf/lib/cpumap.c

+12 −0
Original line number Diff line number Diff line
@@ -260,3 +260,15 @@ int perf_cpu_map__idx(struct perf_cpu_map *cpus, int cpu) 


	return -1;

}



int perf_cpu_map__max(struct perf_cpu_map *map)

{

	int i, max = -1;



	for (i = 0; i < map->nr; i++) {

		if (map->map[i] > max)

			max = map->map[i];

	}



	return max;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ LIBPERF_API void perf_cpu_map__put(struct perf_cpu_map *map); 
LIBPERF_API int perf_cpu_map__cpu(const struct perf_cpu_map *cpus, int idx);

LIBPERF_API int perf_cpu_map__nr(const struct perf_cpu_map *cpus);

LIBPERF_API bool perf_cpu_map__empty(const struct perf_cpu_map *map);

LIBPERF_API int perf_cpu_map__max(struct perf_cpu_map *map);



#define perf_cpu_map__for_each_cpu(cpu, idx, cpus)		\

	for ((idx) = 0, (cpu) = perf_cpu_map__cpu(cpus, idx);	\

tools/perf/lib/libperf.map

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ LIBPERF_0.0.1 { 
		perf_cpu_map__nr;

		perf_cpu_map__cpu;

		perf_cpu_map__empty;

		perf_cpu_map__max;

		perf_thread_map__new_dummy;

		perf_thread_map__set_pid;

		perf_thread_map__comm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE