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

Commit d988d5ee authored Aug 21, 2015 by Kan Liang Committed by Arnaldo Carvalho de Melo Aug 31, 2015

perf evlist: Open event on evsel cpus and threads



An evsel may have different cpus and threads than the evlist it is in.

Use it's own cpus and threads, when opening the evsel in 'perf record'.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1440138194-17001-1-git-send-email-kan.liang@intel.com


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

parent acf860ae

tools/perf/builtin-record.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -279,7 +279,7 @@ static int record__open(struct record *rec)

	evlist__for_each(evlist, pos) {		evlist__for_each(evlist, pos) {
	try_again:		try_again:
	if (perf_evsel__open(pos, evlist->cpus, evlist->threads) < 0) {		if (perf_evsel__open(pos, pos->cpus, pos->threads) < 0) {
	if (perf_evsel__fallback(pos, errno, msg, sizeof(msg))) {		if (perf_evsel__fallback(pos, errno, msg, sizeof(msg))) {
	if (verbose)		if (verbose)
	ui__warning("%s\n", msg);		ui__warning("%s\n", msg);

tools/perf/util/evlist.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1181,6 +1181,10 @@ int perf_evlist__apply_filters(struct perf_evlist evlist, struct perf_evsel *e
	if (evsel->filter == NULL)		if (evsel->filter == NULL)
	continue;		continue;

			/*
			* filters only work for tracepoint event, which doesn't have cpu limit.
			* So evlist and evsel should always be same.
			*/
	err = perf_evsel__apply_filter(evsel, ncpus, nthreads, evsel->filter);		err = perf_evsel__apply_filter(evsel, ncpus, nthreads, evsel->filter);
	if (err) {		if (err) {
	*err_evsel = evsel;		*err_evsel = evsel;