Commit e2de90bd authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf cpumap: Add "any" CPU handling to cpu_map__snprint_mask 



If the perf_cpu_map is empty or is just the any CPU value, then early
return. Don't process the "any" CPU when creating the bitmap.

Tested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Tested-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent a0a41736

tools/perf/util/cpumap.c

+7 −2
Original line number Diff line number Diff line
@@ -684,16 +684,21 @@ size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size) 
	unsigned char *bitmap;

	struct perf_cpu c, last_cpu = perf_cpu_map__max(map);



	if (buf == NULL)

	if (buf == NULL || size == 0)

		return 0;



	if (last_cpu.cpu < 0) {

		buf[0] = '\0';

		return 0;

	}



	bitmap = zalloc(last_cpu.cpu / 8 + 1);

	if (bitmap == NULL) {

		buf[0] = '\0';

		return 0;

	}



	perf_cpu_map__for_each_cpu(c, idx, map)

	perf_cpu_map__for_each_cpu_skip_any(c, idx, map)

		bitmap[c.cpu / 8] |= 1 << (c.cpu % 8);



	for (int cpu = last_cpu.cpu / 4 * 4; cpu >= 0; cpu -= 4) {