diff options
Diffstat (limited to 'tools/perf/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 14 | 
1 files changed, 6 insertions, 8 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 69436b3200a4..a9ac0504aabd 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c  | |||
| @@ -674,7 +674,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 674 | struct perf_evlist *evlist = &pevlist->evlist; | 674 | struct perf_evlist *evlist = &pevlist->evlist; | 
| 675 | union perf_event *event; | 675 | union perf_event *event; | 
| 676 | int sample_id_all = 1, cpu; | 676 | int sample_id_all = 1, cpu; | 
| 677 | static char *kwlist[] = {"sample_id_all", NULL, NULL}; | 677 | static char *kwlist[] = {"cpu", "sample_id_all", NULL, NULL}; | 
| 678 | int err; | 678 | int err; | 
| 679 | 679 | ||
| 680 | if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, | 680 | if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, | 
| @@ -692,16 +692,14 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 692 | 692 | ||
| 693 | first = list_entry(evlist->entries.next, struct perf_evsel, node); | 693 | first = list_entry(evlist->entries.next, struct perf_evsel, node); | 
| 694 | err = perf_event__parse_sample(event, first->attr.sample_type, | 694 | err = perf_event__parse_sample(event, first->attr.sample_type, | 
| 695 | perf_sample_size(first->attr.sample_type), | 695 | perf_evsel__sample_size(first), | 
| 696 | sample_id_all, &pevent->sample); | 696 | sample_id_all, &pevent->sample); | 
| 697 | if (err) { | 697 | if (err) | 
| 698 | pr_err("Can't parse sample, err = %d\n", err); | 698 | return PyErr_Format(PyExc_OSError, | 
| 699 | goto end; | 699 | "perf: can't parse sample, err=%d", err); | 
| 700 | } | ||
| 701 | |||
| 702 | return pyevent; | 700 | return pyevent; | 
| 703 | } | 701 | } | 
| 704 | end: | 702 | |
| 705 | Py_INCREF(Py_None); | 703 | Py_INCREF(Py_None); | 
| 706 | return Py_None; | 704 | return Py_None; | 
| 707 | } | 705 | } | 
