From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752696AbcGMH14 (ORCPT ); Wed, 13 Jul 2016 03:27:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42314 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbcGMH1r (ORCPT ); Wed, 13 Jul 2016 03:27:47 -0400 Date: Wed, 13 Jul 2016 00:27:33 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, namhyung@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, dsahern@gmail.com In-Reply-To: <1468148882-10362-8-git-send-email-jolsa@kernel.org> References: <1468148882-10362-8-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf python: Add struct evsel into struct pyrf_event Git-Commit-ID: 377f698db12150a1cf79987dca1d3990fa14a1f8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 377f698db12150a1cf79987dca1d3990fa14a1f8 Gitweb: http://git.kernel.org/tip/377f698db12150a1cf79987dca1d3990fa14a1f8 Author: Jiri Olsa AuthorDate: Sun, 10 Jul 2016 13:07:59 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jul 2016 16:18:36 -0300 perf python: Add struct evsel into struct pyrf_event To be able to find out event configuration info during sample parsing. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1468148882-10362-8-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/python.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 45fdd4a..dc7adaa 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -48,6 +48,7 @@ PyMODINIT_FUNC initperf(void); struct pyrf_event { PyObject_HEAD + struct perf_evsel *evsel; struct perf_sample sample; union perf_event event; }; @@ -865,11 +866,18 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, if (event != NULL) { PyObject *pyevent = pyrf_event__new(event); struct pyrf_event *pevent = (struct pyrf_event *)pyevent; + struct perf_evsel *evsel; if (pyevent == NULL) return PyErr_NoMemory(); - err = perf_evlist__parse_sample(evlist, event, &pevent->sample); + evsel = perf_evlist__event2evsel(evlist, event); + if (!evsel) + return Py_None; + + pevent->evsel = evsel; + + err = perf_evsel__parse_sample(evsel, event, &pevent->sample); /* Consume the even only after we parsed it out. */ perf_evlist__mmap_consume(evlist, cpu);