diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-15 01:05:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-15 05:55:46 -0400 |
commit | 1ff9ecf797e398b9937d9da4c2236f4140b96339 (patch) | |
tree | 568ea3af4009cd513540f2541b55132ab186ed43 /tools/perf/util/python.c | |
parent | 426ee9e3bbc478ed9c0a079a4270f6095f0eb975 (diff) | |
parent | 784f3390f9bd900adfb3b0373615e105a0d9749a (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* kcore annotation improvements, including build-id cache support,
multi map 'call' instruction navigation fixes, kcore address
validation, objdump workarounds. From Adrian Hunter.
* 'trace' beautifiers for lots of syscall arguments, from Arnaldo Carvalho de Melo.
* More compact 'trace' output by suppressing zeroed args, from Arnaldo Carvalho de Melo.
* Show thread COMM by default in 'trace', from Arnaldo Carvalho de Melo.
* Show path associated with fd in live sessions, using a 'vfs_getname'
'perf probe' created dynamic tracepoint or by looking at /proc/pid/fd, from Arnaldo Carvalho de Melo.
* Memory and mmap leak fixes from Chenggang Qin.
* Add option to show full timestamp in 'trace', from David Ahern.
* Add 'record' command in 'trace', to record raw_syscalls:*, from David Ahern.
* Add summary option to dump syscall statistics in 'trace', from David Ahern.
* Fix comm resolution in 'trace' when reading events from file, from David Ahern.
* Improved messages when doing profiling in all or a subset of CPUs
using a workload as the session delimitator, as in:
'perf stat --cpu 0,2 sleep 10s'
from Arnaldo Carvalho de Melo.
* Add units to nanosec-based counters in 'perf stat', from David Ahern.
* Assorted build fixes for from David Ahern and Jiri Olsa.
* 'perf lock' fixes and cleanups, from Davidlohr Bueso.
* Memory leak fixes in 'perf test', from Felipe Pena.
* Build system super speedups, from Ingo Molnar.
* Fix mmap_read event overflow, from Jiri Olsa.
* Code cleanups from Jiri Olsa.
* Allow specifying B/K/M/G unit to the --mmap-pages arguments, from Jiri Olsa.
* Separate the GTK support in a separate libperf-gtk.so DSO, that is
only loaded when --gtk is specified, from Namhyung Kim.
* Fixes for some memory leaks, from Namhyumg Kim.
* Fix srcline sort key behavior, from Namhyung Kim.
* Fix failing assertions in numa bench, from Petr Holasek.
* perf bash completion fixes and improvements from Ramkumar Ramachandra.
* Improve error messages in 'trace', providing hints about system configuration
steps needed for using it, from Ramkumar Ramachandra.
* Remove bogus info when using 'perf stat' -e cycles/instructions, from
Ramkumar Ramachandra.
* Support for Openembedded/Yocto -dbg packages, from Ricardo Ribalda Delgado.
* Implement addr2line directly using libbfd, from Roberto Vitillo.
* Add new option --ignore-vmlinux for perf top, from Willy Tarreau.
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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 71b5412bbbb9..06efd027b1db 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) \ |
@@ -1036,6 +1029,7 @@ PyMODINIT_FUNC initperf(void) | |||
1036 | pyrf_cpu_map__setup_types() < 0) | 1029 | pyrf_cpu_map__setup_types() < 0) |
1037 | return; | 1030 | return; |
1038 | 1031 | ||
1032 | /* The page_size is placed in util object. */ | ||
1039 | page_size = sysconf(_SC_PAGE_SIZE); | 1033 | page_size = sysconf(_SC_PAGE_SIZE); |
1040 | 1034 | ||
1041 | Py_INCREF(&pyrf_evlist__type); | 1035 | Py_INCREF(&pyrf_evlist__type); |