Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1e7e43 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Rename cpu_map__all() to cpu_map__empty() 



The CPU map is in an "empty" (or not-applicable) state when monitoring
specific threads.

cpu_map__all() returns true if the CPU map is in this empty state (i.e
for the 'empty_cpu_map' or if we created the map via
cpu_map__dummy_new().

The name, cpu_map__all(), is misleading, because even when monitoring
all CPUs, (eg: perf record -a), cpu_map__all() returns false.

Rename cpu_map__all() to cpu_map__empty().

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20130523012620.GA27733@us.ibm.com


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

tools/perf/util/cpumap.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline int cpu_map__nr(const struct cpu_map *map) 
	return map ? map->nr : 1;

}



static inline bool cpu_map__all(const struct cpu_map *map)

static inline bool cpu_map__empty(const struct cpu_map *map)

{

	return map ? map->map[0] == -1 : true;

}

tools/perf/util/evlist.c

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ void perf_evlist__munmap(struct perf_evlist *evlist) 
static int perf_evlist__alloc_mmap(struct perf_evlist *evlist)

{

	evlist->nr_mmaps = cpu_map__nr(evlist->cpus);

	if (cpu_map__all(evlist->cpus))

	if (cpu_map__empty(evlist->cpus))

		evlist->nr_mmaps = thread_map__nr(evlist->threads);

	evlist->mmap = zalloc(evlist->nr_mmaps * sizeof(struct perf_mmap));

	return evlist->mmap != NULL ? 0 : -ENOMEM;
@@ -573,7 +573,7 @@ int perf_evlist__mmap(struct perf_evlist *evlist, unsigned int pages, 
			return -ENOMEM;

	}



	if (cpu_map__all(cpus))

	if (cpu_map__empty(cpus))

		return perf_evlist__mmap_per_thread(evlist, prot, mask);



	return perf_evlist__mmap_per_cpu(evlist, prot, mask);