diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 18:32:26 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-17 18:32:26 +0400 |
| commit | f8db4cc4f2b11bdded6c94f0d55906847474b982 (patch) | |
| tree | d1b99d186edb9d203fafd896f19487125a2395af /tools/perf/util/python.c | |
| parent | 2e2de2e314672c8b6644f67a35556d6df780493d (diff) | |
| parent | e479c60456ef22b0869432887216186aabaed086 (diff) | |
| download | linux-f8db4cc4f2b11bdded6c94f0d55906847474b982.tar.xz | |
Merge branch 'spi/merge' into spi/next
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, struct perf_evlist *evlist = &pevlist->evlist; union perf_event *event; int sample_id_all = 1, cpu; - static char *kwlist[] = {"sample_id_all", NULL, NULL}; + static char *kwlist[] = {"cpu", "sample_id_all", NULL, NULL}; int err; if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i", kwlist, @@ -692,16 +692,14 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, first = list_entry(evlist->entries.next, struct perf_evsel, node); err = perf_event__parse_sample(event, first->attr.sample_type, - perf_sample_size(first->attr.sample_type), + perf_evsel__sample_size(first), sample_id_all, &pevent->sample); - if (err) { - pr_err("Can't parse sample, err = %d\n", err); - goto end; - } - + if (err) + return PyErr_Format(PyExc_OSError, + "perf: can't parse sample, err=%d", err); return pyevent; } -end: + Py_INCREF(Py_None); return Py_None; } |