diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-08-27 04:22:25 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-08-27 04:22:25 -0400 |
commit | 794b8bedca9341569e1081bc880e7ea209dbca5c (patch) | |
tree | accdfe136daf45dea3ee62567a53ae2bfb0f7fd8 /tools/perf/util/stat.h | |
parent | 39152ee51b77851689f9b23fde6f610d13566c39 (diff) | |
parent | 74a1e863eb73dcc9f069b671dfb40650f3832116 (diff) |
Merge tag 'perf-core-for-mingo-5.4-20190826' 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:
perf report:
Andi Kleen:
- Make --ns time sort key output column wide enough for nanoseconds.
perf script:
Gustavo A. R. Silva:
- Fix memory leaks in list_scripts()
perf tests:
James Clark:
- Fixes hang in zstd compression test by changing the source of random data.
perf trace:
Arnaldo Carvalho de Melo:
- augmented_raw_syscalls.c BPF helper improvements.
Benjamin Peterson:
- Fix off-by-one error in ioctl cmd->string table.
libperf:
Jiri Olsa:
- Move most PERF_RECORD_ structs to perf/event.h.
headers:
Arnaldo Carvalho de Melo:
- Move cacheline related routines to separate source files.
- Move record_opts and other record declarations to separate files.
- Explicitly add some more needed headers here and there.
Souptick Joarder:
- Remove some duplicate include directives.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/stat.h')
-rw-r--r-- | tools/perf/util/stat.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index bcb376e1b3a7..14fe3e548229 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h | |||
@@ -5,13 +5,12 @@ | |||
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <sys/types.h> | 7 | #include <sys/types.h> |
8 | #include <sys/time.h> | ||
9 | #include <sys/resource.h> | 8 | #include <sys/resource.h> |
10 | #include <sys/wait.h> | ||
11 | #include "rblist.h" | 9 | #include "rblist.h" |
12 | #include "perf.h" | ||
13 | #include "event.h" | 10 | #include "event.h" |
14 | 11 | ||
12 | struct timespec; | ||
13 | |||
15 | struct stats { | 14 | struct stats { |
16 | double n, mean, M2; | 15 | double n, mean, M2; |
17 | u64 max, min; | 16 | u64 max, min; |
@@ -199,6 +198,8 @@ int perf_stat_process_counter(struct perf_stat_config *config, | |||
199 | struct perf_tool; | 198 | struct perf_tool; |
200 | union perf_event; | 199 | union perf_event; |
201 | struct perf_session; | 200 | struct perf_session; |
201 | struct target; | ||
202 | |||
202 | int perf_event__process_stat_event(struct perf_session *session, | 203 | int perf_event__process_stat_event(struct perf_session *session, |
203 | union perf_event *event); | 204 | union perf_event *event); |
204 | 205 | ||