diff options
Diffstat (limited to 'tools/perf/util/python.c')
| -rw-r--r-- | tools/perf/util/python.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 71b5412bbbb9..122669c18ff4 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c | |||
| @@ -33,13 +33,6 @@ int eprintf(int level, const char *fmt, ...) | |||
| 33 | # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, | 33 | # define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size, |
| 34 | #endif | 34 | #endif |
| 35 | 35 | ||
| 36 | struct throttle_event { | ||
| 37 | struct perf_event_header header; | ||
| 38 | u64 time; | ||
| 39 | u64 id; | ||
| 40 | u64 stream_id; | ||
| 41 | }; | ||
| 42 | |||
| 43 | PyMODINIT_FUNC initperf(void); | 36 | PyMODINIT_FUNC initperf(void); |
| 44 | 37 | ||
| 45 | #define member_def(type, member, ptype, help) \ | 38 | #define member_def(type, member, ptype, help) \ |
| @@ -822,6 +815,8 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, | |||
| 822 | PyObject *pyevent = pyrf_event__new(event); | 815 | PyObject *pyevent = pyrf_event__new(event); |
| 823 | struct pyrf_event *pevent = (struct pyrf_event *)pyevent; | 816 | struct pyrf_event *pevent = (struct pyrf_event *)pyevent; |
| 824 | 817 | ||
| 818 | perf_evlist__mmap_consume(evlist, cpu); | ||
| 819 | |||
| 825 | if (pyevent == NULL) | 820 | if (pyevent == NULL) |
| 826 | return PyErr_NoMemory(); | 821 | return PyErr_NoMemory(); |
| 827 | 822 | ||
| @@ -913,9 +908,10 @@ static PyObject *pyrf_evlist__item(PyObject *obj, Py_ssize_t i) | |||
| 913 | if (i >= pevlist->evlist.nr_entries) | 908 | if (i >= pevlist->evlist.nr_entries) |
| 914 | return NULL; | 909 | return NULL; |
| 915 | 910 | ||
| 916 | list_for_each_entry(pos, &pevlist->evlist.entries, node) | 911 | evlist__for_each(&pevlist->evlist, pos) { |
| 917 | if (i-- == 0) | 912 | if (i-- == 0) |
| 918 | break; | 913 | break; |
| 914 | } | ||
| 919 | 915 | ||
| 920 | return Py_BuildValue("O", container_of(pos, struct pyrf_evsel, evsel)); | 916 | return Py_BuildValue("O", container_of(pos, struct pyrf_evsel, evsel)); |
| 921 | } | 917 | } |
| @@ -1036,6 +1032,7 @@ PyMODINIT_FUNC initperf(void) | |||
| 1036 | pyrf_cpu_map__setup_types() < 0) | 1032 | pyrf_cpu_map__setup_types() < 0) |
| 1037 | return; | 1033 | return; |
| 1038 | 1034 | ||
| 1035 | /* The page_size is placed in util object. */ | ||
| 1039 | page_size = sysconf(_SC_PAGE_SIZE); | 1036 | page_size = sysconf(_SC_PAGE_SIZE); |
| 1040 | 1037 | ||
| 1041 | Py_INCREF(&pyrf_evlist__type); | 1038 | Py_INCREF(&pyrf_evlist__type); |
