Commit 55261f46 authored May 07, 2012 by Namhyung Kim Committed by Arnaldo Carvalho de Melo May 07, 2012

perf evlist: Fix creation of cpu map



Currently, 'perf record -- sleep 1' creates a cpu map for all online
cpus since it turns out calling cpu_map__new(NULL). Fix it.

Also it is guaranteed that cpu_list is NULL if PID/TID is given by
calling perf_target__validate(), so we can make the conditional bit
simpler.

This also fixes perf test 7 (Validate) failure on my 6 core machine:

  $ cat /sys/devices/system/cpu/online
  0-11
  $ ./perf test -v 7
   7: Validate PERF_RECORD_* events & perf_sample fields:
  --- start ---
  perf_evlist__mmap: Operation not permitted
  ---- end ----
  Validate PERF_RECORD_* events & perf_sample fields: FAILED!

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1336367344-28071-3-git-send-email-namhyung.kim@lge.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 10b47d54

tools/perf/util/evlist.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -609,8 +609,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist,
		if (evlist->threads == NULL)
		return -1;

		if (target->uid != UINT_MAX \|\|
		(target->cpu_list == NULL && target->tid))
		if (target->uid != UINT_MAX \|\| target->tid)
		evlist->cpus = cpu_map__dummy_new();
		else if (!target->system_wide && target->cpu_list == NULL)
		evlist->cpus = cpu_map__dummy_new();
		else
		evlist->cpus = cpu_map__new(target->cpu_list);

Admin message