perf env: Remove needless cpumap.h header
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 87ffb6c6407023419ae6b2770142b0754d9cbaa1 Gitweb: https://git.kernel.org/tip/87ffb6c6407023419ae6b2770142b0754d9cbaa1 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 10 Sep 2019 16:29:02 +01:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 09:19:21 -03:00
perf env: Remove needless cpumap.h header
Only a 'struct perf_cmp_map' forward allocation is necessary, fix the places that need the header but were getting it indirectly, by luck, from env.h.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/arch/arm64/util/header.c | 4 +++- tools/perf/arch/x86/tests/perf-time-to-tsc.c | 1 - tools/perf/bench/epoll-ctl.c | 2 +- tools/perf/bench/epoll-wait.c | 2 +- tools/perf/bench/futex-hash.c | 2 +- tools/perf/bench/futex-lock-pi.c | 2 +- tools/perf/bench/futex-requeue.c | 2 +- tools/perf/bench/futex-wake-parallel.c | 3 ++- tools/perf/bench/futex-wake.c | 2 +- tools/perf/builtin-c2c.c | 1 + tools/perf/builtin-sched.c | 2 ++ tools/perf/tests/bitmap.c | 2 +- tools/perf/tests/code-reading.c | 1 - tools/perf/tests/event_update.c | 1 + tools/perf/tests/keep-tracking.c | 3 +-- tools/perf/tests/mem2node.c | 2 +- tools/perf/tests/mmap-basic.c | 3 +-- tools/perf/tests/openat-syscall-all-cpus.c | 5 +++-- tools/perf/tests/switch-tracking.c | 1 - tools/perf/tests/task-exit.c | 2 +- tools/perf/tests/topology.c | 1 + tools/perf/util/arm-spe.c | 1 - tools/perf/util/auxtrace.c | 1 - tools/perf/util/env.h | 3 ++- tools/perf/util/event.c | 2 ++ tools/perf/util/evsel.c | 2 +- tools/perf/util/intel-bts.c | 1 - tools/perf/util/parse-events.c | 1 - tools/perf/util/pmu.c | 1 - tools/perf/util/python.c | 1 - tools/perf/util/record.c | 1 - tools/perf/util/s390-cpumsf.c | 1 - tools/perf/util/scripting-engines/trace-event-python.c | 1 - tools/perf/util/session.c | 1 - tools/perf/util/stat.c | 1 + tools/perf/util/svghelper.c | 2 +- tools/perf/util/top.c | 1 - 37 files changed, 31 insertions(+), 34 deletions(-)
tools/perf/arch/arm64/util/header.c +3 -1
@@ -1,5 +1,7 @@#include <stdio.h> #include <stdlib.h> +#include <perf/cpumap.h> +#include <internal/cpumap.h> #include <api/fs/fs.h> #include "debug.h" #include "header.h"
@@ -29,7 +31,7 @@ char *get_cpuid_str(struct perf_pmu *pmu)/* read midr from list of cpus mapped to this pmu */ cpus =perf_cpu_map__get (pmu->cpus); -for (cpu =0 ; cpu < cpus->nr; cpu++) { +for (cpu =0 ; cpu <perf_cpu_map__nr (cpus); cpu++) {scnprintf (path,PATH_MAX ,"%s/devices/system/cpu/cpu%d" MIDR , sysfs, cpus->map[cpu]);
tools/perf/arch/x86/tests/perf-time-to-tsc.c +0 -1
@@ -15,7 +15,6 @@#include "evlist.h" #include "evsel.h" #include "thread_map.h" -#include "cpumap.h" #include "record.h" #include "tsc.h" #include "tests/tests.h"
tools/perf/bench/epoll-ctl.c +1 -1
@@ -21,12 +21,12 @@#include <sys/resource.h> #include <sys/epoll.h> #include <sys/eventfd.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> #include "bench.h" -#include "cpumap.h" #include <err.h>
tools/perf/bench/epoll-wait.c +1 -1
@@ -76,12 +76,12 @@#include <sys/epoll.h> #include <sys/eventfd.h> #include <sys/types.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> #include "bench.h" -#include "cpumap.h" #include <err.h>
tools/perf/bench/futex-hash.c +1 -1
@@ -20,13 +20,13 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <sys/time.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "../util/stat.h" #include <subcmd/parse-options.h> #include "bench.h" #include "futex.h" -#include "cpumap.h" #include <err.h>
tools/perf/bench/futex-lock-pi.c +1 -1
@@ -14,10 +14,10 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <errno.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "bench.h" #include "futex.h" -#include "cpumap.h" #include <err.h> #include <stdlib.h>
tools/perf/bench/futex-requeue.c +1 -1
@@ -20,10 +20,10 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "bench.h" #include "futex.h" -#include "cpumap.h" #include <err.h> #include <stdlib.h>
tools/perf/bench/futex-wake-parallel.c +2 -1
@@ -29,7 +29,8 @@ int bench_futex_wake_parallel(int argc __maybe_unused, const char **argv __maybe#include <linux/time64.h> #include <errno.h> #include "futex.h" -#include "cpumap.h" +#include <internal/cpumap.h> +#include <perf/cpumap.h> #include <err.h> #include <stdlib.h>
tools/perf/bench/futex-wake.c +1 -1
@@ -20,10 +20,10 @@#include <linux/kernel.h> #include <linux/time64.h> #include <errno.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "bench.h" #include "futex.h" -#include "cpumap.h" #include <err.h> #include <stdlib.h>
tools/perf/builtin-c2c.c +1 -0
@@ -20,6 +20,7 @@#include <sys/param.h> #include "debug.h" #include "builtin.h" +#include <perf/cpumap.h> #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include "map_symbol.h"
tools/perf/builtin-sched.c +2 -0
@@ -3,6 +3,7 @@#include "perf.h" #include "perf-sys.h" +#include "util/cpumap.h" #include "util/evlist.h" #include "util/evsel.h" #include "util/symbol.h"
@@ -36,6 +37,7 @@#include <pthread.h> #include <math.h> #include <api/fs/fs.h> +#include <perf/cpumap.h> #include <linux/time64.h> #include <linux/ctype.h>
tools/perf/tests/bitmap.c +1 -1
@@ -2,8 +2,8 @@#include <linux/compiler.h> #include <linux/bitmap.h> #include <perf/cpumap.h> +#include <internal/cpumap.h> #include "tests.h" -#include "cpumap.h" #include "debug.h" #define NBITS 100
tools/perf/tests/code-reading.c +0 -1
@@ -19,7 +19,6 @@#include "evlist.h" #include "evsel.h" #include "thread_map.h" -#include "cpumap.h" #include "machine.h" #include "map.h" #include "symbol.h"
tools/perf/tests/event_update.c +1 -0
@@ -2,6 +2,7 @@#include <linux/compiler.h> #include <perf/cpumap.h> #include <string.h> +#include "cpumap.h" #include "evlist.h" #include "evsel.h" #include "header.h"
tools/perf/tests/keep-tracking.c +1 -2
@@ -12,7 +12,6 @@#include "evsel.h" #include "record.h" #include "thread_map.h" -#include "cpumap.h" #include "tests.h" #define CHECK__ (x) { \
@@ -143,7 +142,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un found =find_comm (evlist, comm);if (found !=1 ) { -pr_debug ("Seconf time, failed to find tracking event.\n" ); +pr_debug ("Second time, failed to find tracking event.\n" ); goto out_err; }
tools/perf/tests/mem2node.c +1 -1
@@ -4,7 +4,7 @@#include <linux/kernel.h> #include <linux/zalloc.h> #include <perf/cpumap.h> -#include "cpumap.h" +#include <internal/cpumap.h> #include "debug.h" #include "env.h" #include "mem2node.h"
tools/perf/tests/mmap-basic.c +1 -2
@@ -10,7 +10,6 @@#include "evlist.h" #include "evsel.h" #include "thread_map.h" -#include "cpumap.h" #include "tests.h" #include <linux/err.h> #include <linux/kernel.h>
@@ -53,7 +52,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) { -pr_debug ("cpu_map__new\n" ); +pr_debug ("perf_cpu_map__new\n" ); goto out_free_threads; }
tools/perf/tests/openat-syscall-all-cpus.c +3 -2
@@ -14,7 +14,8 @@#include "evsel.h" #include "tests.h" #include "thread_map.h" -#include "cpumap.h" +#include <perf/cpumap.h> +#include <internal/cpumap.h> #include "debug.h" #include "stat.h" #include "util/counts.h"
@@ -37,7 +38,7 @@ int test__openat_syscall_event_on_all_cpus(struct test *test __maybe_unused, int cpus =perf_cpu_map__new (NULL );if (cpus ==NULL ) { -pr_debug ("cpu_map__new\n" ); +pr_debug ("perf_cpu_map__new\n" ); goto out_thread_map_delete; }
tools/perf/tests/switch-tracking.c +0 -1
@@ -14,7 +14,6 @@#include "evlist.h" #include "evsel.h" #include "thread_map.h" -#include "cpumap.h" #include "record.h" #include "tests.h"
tools/perf/tests/task-exit.c +1 -1
@@ -4,12 +4,12 @@#include "evsel.h" #include "target.h" #include "thread_map.h" -#include "cpumap.h" #include "tests.h" #include <errno.h> #include <signal.h> #include <linux/string.h> +#include <perf/cpumap.h> #include <perf/evlist.h> static int exited;
tools/perf/tests/topology.c +1 -0
@@ -3,6 +3,7 @@#include <stdlib.h> #include <stdio.h> #include <perf/cpumap.h> +#include "cpumap.h" #include "tests.h" #include "session.h" #include "evlist.h"
tools/perf/util/arm-spe.c +0 -1
@@ -16,7 +16,6 @@#include <linux/log2.h> #include <linux/zalloc.h> -#include "cpumap.h" #include "color.h" #include "evsel.h" #include "machine.h"
tools/perf/util/auxtrace.c +0 -1
@@ -31,7 +31,6 @@#include "map.h" #include "pmu.h" #include "evsel.h" -#include "cpumap.h" #include "symbol.h" #include "thread_map.h" #include "asm/bug.h"
tools/perf/util/env.h +2 -1
@@ -4,9 +4,10 @@#include <linux/types.h> #include <linux/rbtree.h> -#include "cpumap.h" #include "rwsem.h" +struct perf_cpu_map ; +struct cpu_topology_map {int socket_id;int die_id;
tools/perf/util/event.c +2 -0
@@ -4,6 +4,7 @@#include <inttypes.h> #include <linux/kernel.h> #include <linux/types.h> +#include <perf/cpumap.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h>
@@ -11,6 +12,7 @@#include <api/fs/fs.h> #include <linux/perf_event.h> #include <linux/zalloc.h> +#include "cpumap.h" #include "dso.h" #include "event.h" #include "debug.h"
tools/perf/util/evsel.c +1 -1
@@ -31,7 +31,7 @@#include "event.h" #include "evsel.h" #include "evlist.h" -#include "cpumap.h" +#include <perf/cpumap.h> #include "thread_map.h" #include "target.h" #include "perf_regs.h"
tools/perf/util/intel-bts.c +0 -1
@@ -14,7 +14,6 @@#include <linux/log2.h> #include <linux/zalloc.h> -#include "cpumap.h" #include "color.h" #include "evsel.h" #include "evlist.h"
tools/perf/util/parse-events.c +0 -1
@@ -30,7 +30,6 @@#include "parse-events-flex.h" #include "pmu.h" #include "thread_map.h" -#include "cpumap.h" #include "probe-file.h" #include "asm/bug.h" #include "util/parse-branch-options.h"
tools/perf/util/pmu.c +0 -1
@@ -20,7 +20,6 @@#include "debug.h" #include "pmu.h" #include "parse-events.h" -#include "cpumap.h" #include "header.h" #include "pmu-events/pmu-events.h" #include "string2.h"
tools/perf/util/python.c +0 -1
@@ -11,7 +11,6 @@#include "callchain.h" #include "evsel.h" #include "event.h" -#include "cpumap.h" #include "print_binary.h" #include "thread_map.h" #include "trace-event.h"
tools/perf/util/record.c +0 -1
@@ -2,7 +2,6 @@#include "debug.h" #include "evlist.h" #include "evsel.h" -#include "cpumap.h" #include "parse-events.h" #include <errno.h> #include <limits.h>
tools/perf/util/s390-cpumsf.c +0 -1
@@ -151,7 +151,6 @@#include <sys/stat.h> #include <sys/types.h> -#include "cpumap.h" #include "color.h" #include "evsel.h" #include "evlist.h"
tools/perf/util/scripting-engines/trace-event-python.c +0 -1
@@ -48,7 +48,6 @@#include "map.h" #include "symbol.h" #include "thread_map.h" -#include "cpumap.h" #include "print_binary.h" #include "stat.h" #include "mem-events.h"
tools/perf/util/session.c +0 -1
@@ -22,7 +22,6 @@#include "symbol.h" #include "session.h" #include "tool.h" -#include "cpumap.h" #include "perf_regs.h" #include "asm/bug.h" #include "auxtrace.h"
tools/perf/util/stat.c +1 -0
@@ -4,6 +4,7 @@#include <math.h> #include <string.h> #include "counts.h" +#include "cpumap.h" #include "debug.h" #include "header.h" #include "stat.h"
tools/perf/util/svghelper.c +1 -1
@@ -17,11 +17,11 @@#include <linux/string.h> #include <linux/time64.h> #include <linux/zalloc.h> +#include <internal/cpumap.h> #include <perf/cpumap.h> #include "env.h" #include "svghelper.h" -#include "cpumap.h" static u64 first_time, last_time;static u64 turbo_frequency, max_freq;
tools/perf/util/top.c +0 -1
@@ -5,7 +5,6 @@* Refactored from builtin-top.c, see that files for further copyright notes. */ -#include "cpumap.h" #include "event.h" #include "evlist.h" #include "evsel.h"