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

Commit 9c105fbc authored by Dongsheng Yang's avatar Dongsheng Yang Committed by Arnaldo Carvalho de Melo
Browse files

perf target: Move the checking of which map function to call into function. 



Check for cpu_map__dummy_new() or cpu_map__new() to be called in
perf_evlist__create_maps() is more complicated.

This patch moves the checking work into target.h, combining two
conditions and making perf_evlist__create_maps() more readable.

Signed-off-by: default avatarDongsheng Yang <yangds.fnst@cn.fujitsu.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/b8c41f1fd2c4f0df71eb7b19aea74fb64d46cdda.1386197481.git.yangds.fnst@cn.fujitsu.com


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

tools/perf/util/evlist.c

+1 −7
Original line number Diff line number Diff line
@@ -819,13 +819,7 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, struct target *target) 
	if (evlist->threads == NULL)

		return -1;



	if (target->default_per_cpu)

		evlist->cpus = target->per_thread ?

					cpu_map__dummy_new() :

					cpu_map__new(target->cpu_list);

	else if (target__has_task(target))

		evlist->cpus = cpu_map__dummy_new();

	else if (!target__has_cpu(target) && !target->uses_mmap)

	if (target__uses_dummy_map(target))

		evlist->cpus = cpu_map__dummy_new();

	else

		evlist->cpus = cpu_map__new(target->cpu_list);

tools/perf/util/target.h

+13 −0
Original line number Diff line number Diff line
@@ -63,4 +63,17 @@ static inline bool target__none(struct target *target) 
	return !target__has_task(target) && !target__has_cpu(target);

}



static inline bool target__uses_dummy_map(struct target *target)

{

	bool use_dummy = false;



	if (target->default_per_cpu)

		use_dummy = target->per_thread ? true : false;

	else if (target__has_task(target) ||

	         (!target__has_cpu(target) && !target->uses_mmap))

		use_dummy = true;



	return use_dummy;

}



#endif /* _PERF_TARGET_H */