diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-05 12:39:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-05 12:39:12 +0200 |
| commit | 8a06bf14008fbf55a86105b8569494f4beeb8762 (patch) | |
| tree | 74c0313294eb9dc2bb409ce5ea154b478c6628cd /tools/perf/util/python.c | |
| parent | e7882d6c40874a5b5033ca85f7508a602a60b662 (diff) | |
| parent | 7f309ed6453926a81e2a97d274f67f1e48f0d74c (diff) | |
| download | lwn-8a06bf14008fbf55a86105b8569494f4beeb8762.tar.gz lwn-8a06bf14008fbf55a86105b8569494f4beeb8762.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core fixes and some late updates from Arnaldo Carvalho de Melo:
* Make clean brace expansion fix for some shells, from Palmer Cox
* Warn user just once per guest kernel when not finding kernel info,
from David Ahern
* perf test fix from Jiri Olsa
* Fix error handling on event creation in perf top, from David Ahern
* Fix check on perf_target__strnerror, from Namhyung Kim
* Save the whole cmdline, from David Ahern
* Prep work for the DWARF CFI post unwinder, so that it doesn't
uses perf_session in lots of places, just evlist/evsel is enough.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index e03b58a48424..0688bfb6d280 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -797,17 +797,13 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, event = perf_evlist__mmap_read(evlist, cpu); if (event != NULL) { - struct perf_evsel *first; PyObject *pyevent = pyrf_event__new(event); struct pyrf_event *pevent = (struct pyrf_event *)pyevent; if (pyevent == NULL) return PyErr_NoMemory(); - first = list_entry(evlist->entries.next, struct perf_evsel, node); - err = perf_event__parse_sample(event, first->attr.sample_type, - perf_evsel__sample_size(first), - sample_id_all, &pevent->sample, false); + err = perf_evlist__parse_sample(evlist, event, &pevent->sample, false); if (err) return PyErr_Format(PyExc_OSError, "perf: can't parse sample, err=%d", err); |