Skip to content

Commit 794b8be

Browse files
author
Ingo Molnar
committed
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents 39152ee + 74a1e86 commit 794b8be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+493
-427
lines changed

tools/perf/arch/arm/util/cs-etm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <linux/zalloc.h>
1616

1717
#include "cs-etm.h"
18-
#include "../../perf.h"
18+
#include "../../util/record.h"
1919
#include "../../util/auxtrace.h"
2020
#include "../../util/cpumap.h"
2121
#include "../../util/evlist.h"

tools/perf/arch/arm64/util/arm-spe.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "../../util/pmu.h"
2020
#include "../../util/debug.h"
2121
#include "../../util/auxtrace.h"
22+
#include "../../util/record.h"
2223
#include "../../util/arm-spe.h"
2324

2425
#define KiB(x) ((x) * 1024)

tools/perf/arch/s390/util/auxtrace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "../../util/evlist.h"
99
#include "../../util/auxtrace.h"
1010
#include "../../util/evsel.h"
11+
#include "../../util/record.h"
1112

1213
#define PERF_EVENT_CPUM_SF 0xB0000 /* Event: Basic-sampling */
1314
#define PERF_EVENT_CPUM_SF_DIAG 0xBD000 /* Event: Combined-sampling */

tools/perf/arch/x86/tests/perf-time-to-tsc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <errno.h>
33
#include <inttypes.h>
4+
#include <stdbool.h>
45
#include <stdio.h>
56
#include <unistd.h>
67
#include <linux/types.h>
@@ -13,6 +14,7 @@
1314
#include "evsel.h"
1415
#include "thread_map.h"
1516
#include "cpumap.h"
17+
#include "record.h"
1618
#include "tsc.h"
1719
#include "tests/tests.h"
1820

tools/perf/arch/x86/util/intel-bts.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "../../util/session.h"
1818
#include "../../util/pmu.h"
1919
#include "../../util/debug.h"
20+
#include "../../util/record.h"
2021
#include "../../util/tsc.h"
2122
#include "../../util/auxtrace.h"
2223
#include "../../util/intel-bts.h"

tools/perf/arch/x86/util/intel-pt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/zalloc.h>
1414
#include <cpuid.h>
1515

16-
#include "../../perf.h"
1716
#include "../../util/session.h"
1817
#include "../../util/event.h"
1918
#include "../../util/evlist.h"
@@ -24,6 +23,8 @@
2423
#include "../../util/pmu.h"
2524
#include "../../util/debug.h"
2625
#include "../../util/auxtrace.h"
26+
#include "../../util/record.h"
27+
#include "../../util/target.h"
2728
#include "../../util/tsc.h"
2829
#include "../../util/intel-pt.h"
2930

tools/perf/builtin-c2c.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "hist.h"
2727
#include "sort.h"
2828
#include "tool.h"
29+
#include "cacheline.h"
2930
#include "data.h"
3031
#include "event.h"
3132
#include "evlist.h"

tools/perf/builtin-diff.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
#include "util/session.h"
1616
#include "util/tool.h"
1717
#include "util/sort.h"
18+
#include "util/srcline.h"
1819
#include "util/symbol.h"
1920
#include "util/data.h"
2021
#include "util/config.h"
2122
#include "util/time-utils.h"
2223
#include "util/annotate.h"
2324
#include "util/map.h"
2425
#include <linux/zalloc.h>
26+
#include <subcmd/parse-options.h>
2527

2628
#include <errno.h>
2729
#include <inttypes.h>

tools/perf/builtin-record.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
*/
99
#include "builtin.h"
1010

11-
#include "perf.h"
12-
1311
#include "util/build-id.h"
1412
#include <subcmd/parse-options.h>
1513
#include "util/parse-events.h"
@@ -22,9 +20,11 @@
2220
#include "util/evlist.h"
2321
#include "util/evsel.h"
2422
#include "util/debug.h"
23+
#include "util/target.h"
2524
#include "util/session.h"
2625
#include "util/tool.h"
2726
#include "util/symbol.h"
27+
#include "util/record.h"
2828
#include "util/cpumap.h"
2929
#include "util/thread_map.h"
3030
#include "util/data.h"

tools/perf/builtin-report.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "util/evswitch.h"
2929
#include "util/header.h"
3030
#include "util/session.h"
31+
#include "util/srcline.h"
3132
#include "util/tool.h"
3233

3334
#include <subcmd/parse-options.h>

0 commit comments

Comments
 (0)