On 01/09/15 11:31, tip-bot for Kan Liang wrote:
> Commit-ID: d988d5ee647861706bc7a391ddbc29429b50f00e
> Gitweb: http://git.kernel.org/tip/d988d5ee647861706bc7a391ddbc29429b50f00e
> Author: Kan Liang <kan.li...@intel.com>
> AuthorDate: Fri, 21 Aug 2015 02:23:14 -0400
> Committer: Arnaldo Carvalho de Melo <a...@redhat.com>
> CommitDate: Mon, 31 Aug 2015 17:28:01 -0300
>
> 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.li...@intel.com>
> Cc: Jiri Olsa <jo...@kernel.org>
> Link:
> http://lkml.kernel.org/r/1440138194-17001-1-git-send-email-kan.li...@intel.com
> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
Just noticed this breaks Intel PT. Will have to investigate further.
> ---
> tools/perf/builtin-record.c | 2 +-
> tools/perf/util/evlist.c | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index a660022..1d14f38 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -279,7 +279,7 @@ static int record__open(struct record *rec)
>
> evlist__for_each(evlist, pos) {
> 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 (verbose)
> ui__warning("%s\n", msg);
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 8d00039..d51a520 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -1181,6 +1181,10 @@ int perf_evlist__apply_filters(struct perf_evlist
> *evlist, struct perf_evsel **e
> if (evsel->filter == NULL)
> 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);
> if (err) {
> *err_evsel = evsel;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
