Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf subcmd: Create subcmd library

Move the subcommand-related files from perf to a new library named
libsubcmd.a.

Since we're moving files anyway, go ahead and rename 'exec_cmd.*' to
'exec-cmd.*' to be consistent with the naming of all the other files.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/c0a838d4c878ab17fee50998811612b2281355c1.1450193761.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Josh Poimboeuf and committed by
Arnaldo Carvalho de Melo
4b6ab94e 2f4ce5ec

+129 -68
+7
tools/lib/subcmd/Build
··· 1 + libsubcmd-y += exec-cmd.o 2 + libsubcmd-y += help.o 3 + libsubcmd-y += pager.o 4 + libsubcmd-y += parse-options.o 5 + libsubcmd-y += run-command.o 6 + libsubcmd-y += sigchain.o 7 + libsubcmd-y += subcmd-config.o
+48
tools/lib/subcmd/Makefile
··· 1 + include ../../scripts/Makefile.include 2 + include ../../perf/config/utilities.mak # QUIET_CLEAN 3 + 4 + ifeq ($(srctree),) 5 + srctree := $(patsubst %/,%,$(dir $(shell pwd))) 6 + srctree := $(patsubst %/,%,$(dir $(srctree))) 7 + srctree := $(patsubst %/,%,$(dir $(srctree))) 8 + #$(info Determined 'srctree' to be $(srctree)) 9 + endif 10 + 11 + CC = $(CROSS_COMPILE)gcc 12 + AR = $(CROSS_COMPILE)ar 13 + RM = rm -f 14 + 15 + MAKEFLAGS += --no-print-directory 16 + 17 + LIBFILE = $(OUTPUT)libsubcmd.a 18 + 19 + CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) 20 + CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC 21 + CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE 22 + 23 + CFLAGS += -I$(srctree)/tools/include/ 24 + CFLAGS += -I$(srctree)/include/uapi 25 + CFLAGS += -I$(srctree)/include 26 + 27 + SUBCMD_IN := $(OUTPUT)libsubcmd-in.o 28 + 29 + all: 30 + 31 + export srctree OUTPUT CC LD CFLAGS V 32 + include $(srctree)/tools/build/Makefile.include 33 + 34 + all: fixdep $(LIBFILE) 35 + 36 + $(SUBCMD_IN): FORCE 37 + @$(MAKE) $(build)=libsubcmd 38 + 39 + $(LIBFILE): $(SUBCMD_IN) 40 + $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(SUBCMD_IN) 41 + 42 + clean: 43 + $(call QUIET_CLEAN, libsubcmd) $(RM) $(LIBFILE); \ 44 + find $(if $(OUTPUT),$(OUTPUT),.) -name \*.o -or -name \*.o.cmd -or -name \*.o.d | xargs $(RM) 45 + 46 + FORCE: 47 + 48 + .PHONY: clean FORCE
+1
tools/perf/MANIFEST
··· 20 20 tools/lib/bpf 21 21 tools/lib/api 22 22 tools/lib/bpf 23 + tools/lib/subcmd 23 24 tools/lib/hweight.c 24 25 tools/lib/rbtree.c 25 26 tools/lib/string.c
+16 -4
tools/perf/Makefile.perf
··· 145 145 STRIP = strip 146 146 AWK = awk 147 147 148 - LIB_DIR = $(srctree)/tools/lib/api/ 148 + LIB_DIR = $(srctree)/tools/lib/api/ 149 149 TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ 150 - BPF_DIR = $(srctree)/tools/lib/bpf/ 150 + BPF_DIR = $(srctree)/tools/lib/bpf/ 151 + SUBCMD_DIR = $(srctree)/tools/lib/subcmd/ 151 152 152 153 # include config/Makefile by default and rule out 153 154 # non-config cases ··· 185 184 ifneq ($(OUTPUT),) 186 185 TE_PATH=$(OUTPUT) 187 186 BPF_PATH=$(OUTPUT) 187 + SUBCMD_PATH=$(OUTPUT) 188 188 ifneq ($(subdir),) 189 189 API_PATH=$(OUTPUT)/../lib/api/ 190 190 else ··· 195 193 TE_PATH=$(TRACE_EVENT_DIR) 196 194 API_PATH=$(LIB_DIR) 197 195 BPF_PATH=$(BPF_DIR) 196 + SUBCMD_PATH=$(SUBCMD_DIR) 198 197 endif 199 198 200 199 LIBTRACEEVENT = $(TE_PATH)libtraceevent.a ··· 208 205 export LIBAPI 209 206 210 207 LIBBPF = $(BPF_PATH)libbpf.a 208 + 209 + LIBSUBCMD = $(SUBCMD_PATH)libsubcmd.a 211 210 212 211 # python extension build directories 213 212 PYTHON_EXTBUILD := $(OUTPUT)python_ext_build/ ··· 262 257 263 258 LIB_FILE=$(OUTPUT)libperf.a 264 259 265 - PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) 260 + PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT) $(LIBSUBCMD) 266 261 ifndef NO_LIBBPF 267 262 PERFLIBS += $(LIBBPF) 268 263 endif ··· 442 437 $(call QUIET_CLEAN, libbpf) 443 438 $(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null 444 439 440 + $(LIBSUBCMD): fixdep FORCE 441 + $(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) $(OUTPUT)libsubcmd.a 442 + 443 + $(LIBSUBCMD)-clean: 444 + $(call QUIET_CLEAN, libsubcmd) 445 + $(Q)$(MAKE) -C $(SUBCMD_DIR) O=$(OUTPUT) clean 446 + 445 447 help: 446 448 @echo 'Perf make targets:' 447 449 @echo ' doc - make *all* documentation (see below)' ··· 596 584 $(call QUIET_CLEAN, config) 597 585 $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ $(if $(OUTPUT),OUTPUT=$(OUTPUT)feature/,) clean >/dev/null 598 586 599 - clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean 587 + clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean config-clean 600 588 $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) 601 589 $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 602 590 $(Q)$(RM) $(OUTPUT).config-detected
+1 -1
tools/perf/arch/x86/util/intel-pt.c
··· 26 26 #include "../../util/evlist.h" 27 27 #include "../../util/evsel.h" 28 28 #include "../../util/cpumap.h" 29 - #include "../../util/parse-options.h" 29 + #include <subcmd/parse-options.h> 30 30 #include "../../util/parse-events.h" 31 31 #include "../../util/pmu.h" 32 32 #include "../../util/debug.h"
+1 -1
tools/perf/bench/futex-hash.c
··· 11 11 #include "../perf.h" 12 12 #include "../util/util.h" 13 13 #include "../util/stat.h" 14 - #include "../util/parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "../util/header.h" 16 16 #include "bench.h" 17 17 #include "futex.h"
+1 -1
tools/perf/bench/futex-lock-pi.c
··· 5 5 #include "../perf.h" 6 6 #include "../util/util.h" 7 7 #include "../util/stat.h" 8 - #include "../util/parse-options.h" 8 + #include <subcmd/parse-options.h> 9 9 #include "../util/header.h" 10 10 #include "bench.h" 11 11 #include "futex.h"
+1 -1
tools/perf/bench/futex-requeue.c
··· 11 11 #include "../perf.h" 12 12 #include "../util/util.h" 13 13 #include "../util/stat.h" 14 - #include "../util/parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "../util/header.h" 16 16 #include "bench.h" 17 17 #include "futex.h"
+1 -1
tools/perf/bench/futex-wake-parallel.c
··· 10 10 #include "../perf.h" 11 11 #include "../util/util.h" 12 12 #include "../util/stat.h" 13 - #include "../util/parse-options.h" 13 + #include <subcmd/parse-options.h> 14 14 #include "../util/header.h" 15 15 #include "bench.h" 16 16 #include "futex.h"
+1 -1
tools/perf/bench/futex-wake.c
··· 11 11 #include "../perf.h" 12 12 #include "../util/util.h" 13 13 #include "../util/stat.h" 14 - #include "../util/parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "../util/header.h" 16 16 #include "bench.h" 17 17 #include "futex.h"
+1 -1
tools/perf/bench/mem-functions.c
··· 8 8 9 9 #include "../perf.h" 10 10 #include "../util/util.h" 11 - #include "../util/parse-options.h" 11 + #include <subcmd/parse-options.h> 12 12 #include "../util/header.h" 13 13 #include "../util/cloexec.h" 14 14 #include "bench.h"
+1 -1
tools/perf/bench/numa.c
··· 7 7 #include "../perf.h" 8 8 #include "../builtin.h" 9 9 #include "../util/util.h" 10 - #include "../util/parse-options.h" 10 + #include <subcmd/parse-options.h> 11 11 #include "../util/cloexec.h" 12 12 13 13 #include "bench.h"
+1 -1
tools/perf/bench/sched-messaging.c
··· 11 11 12 12 #include "../perf.h" 13 13 #include "../util/util.h" 14 - #include "../util/parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "../builtin.h" 16 16 #include "bench.h" 17 17
+1 -1
tools/perf/bench/sched-pipe.c
··· 10 10 */ 11 11 #include "../perf.h" 12 12 #include "../util/util.h" 13 - #include "../util/parse-options.h" 13 + #include <subcmd/parse-options.h> 14 14 #include "../builtin.h" 15 15 #include "bench.h" 16 16
+1 -1
tools/perf/builtin-annotate.c
··· 21 21 #include "util/evsel.h" 22 22 #include "util/annotate.h" 23 23 #include "util/event.h" 24 - #include "util/parse-options.h" 24 + #include <subcmd/parse-options.h> 25 25 #include "util/parse-events.h" 26 26 #include "util/thread.h" 27 27 #include "util/sort.h"
+1 -1
tools/perf/builtin-bench.c
··· 16 16 */ 17 17 #include "perf.h" 18 18 #include "util/util.h" 19 - #include "util/parse-options.h" 19 + #include <subcmd/parse-options.h> 20 20 #include "builtin.h" 21 21 #include "bench/bench.h" 22 22
+1 -1
tools/perf/builtin-buildid-cache.c
··· 16 16 #include "util/cache.h" 17 17 #include "util/debug.h" 18 18 #include "util/header.h" 19 - #include "util/parse-options.h" 19 + #include <subcmd/parse-options.h> 20 20 #include "util/strlist.h" 21 21 #include "util/build-id.h" 22 22 #include "util/session.h"
+1 -1
tools/perf/builtin-buildid-list.c
··· 12 12 #include "util/build-id.h" 13 13 #include "util/cache.h" 14 14 #include "util/debug.h" 15 - #include "util/parse-options.h" 15 + #include <subcmd/parse-options.h> 16 16 #include "util/session.h" 17 17 #include "util/symbol.h" 18 18 #include "util/data.h"
+1 -1
tools/perf/builtin-config.c
··· 9 9 #include "perf.h" 10 10 11 11 #include "util/cache.h" 12 - #include "util/parse-options.h" 12 + #include <subcmd/parse-options.h> 13 13 #include "util/util.h" 14 14 #include "util/debug.h" 15 15
+1 -1
tools/perf/builtin-data.c
··· 2 2 #include "builtin.h" 3 3 #include "perf.h" 4 4 #include "debug.h" 5 - #include "parse-options.h" 5 + #include <subcmd/parse-options.h> 6 6 #include "data-convert-bt.h" 7 7 8 8 typedef int (*data_cmd_fn_t)(int argc, const char **argv, const char *prefix);
+1 -1
tools/perf/builtin-evlist.c
··· 12 12 #include "util/evlist.h" 13 13 #include "util/evsel.h" 14 14 #include "util/parse-events.h" 15 - #include "util/parse-options.h" 15 + #include <subcmd/parse-options.h> 16 16 #include "util/session.h" 17 17 #include "util/data.h" 18 18 #include "util/debug.h"
+4 -4
tools/perf/builtin-help.c
··· 6 6 #include "perf.h" 7 7 #include "util/cache.h" 8 8 #include "builtin.h" 9 - #include "util/exec_cmd.h" 9 + #include <subcmd/exec-cmd.h> 10 10 #include "common-cmds.h" 11 - #include "util/parse-options.h" 12 - #include "util/run-command.h" 13 - #include "util/help.h" 11 + #include <subcmd/parse-options.h> 12 + #include <subcmd/run-command.h> 13 + #include <subcmd/help.h> 14 14 #include "util/debug.h" 15 15 16 16 static struct man_viewer_list {
+1 -1
tools/perf/builtin-inject.c
··· 18 18 #include "util/data.h" 19 19 #include "util/auxtrace.h" 20 20 21 - #include "util/parse-options.h" 21 + #include <subcmd/parse-options.h> 22 22 23 23 #include <linux/list.h> 24 24
+1 -1
tools/perf/builtin-kmem.c
··· 12 12 #include "util/tool.h" 13 13 #include "util/callchain.h" 14 14 15 - #include "util/parse-options.h" 15 + #include <subcmd/parse-options.h> 16 16 #include "util/trace-event.h" 17 17 #include "util/data.h" 18 18 #include "util/cpumap.h"
+1 -1
tools/perf/builtin-kvm.c
··· 10 10 #include "util/header.h" 11 11 #include "util/session.h" 12 12 #include "util/intlist.h" 13 - #include "util/parse-options.h" 13 + #include <subcmd/parse-options.h> 14 14 #include "util/trace-event.h" 15 15 #include "util/debug.h" 16 16 #include "util/tool.h"
+1 -1
tools/perf/builtin-list.c
··· 14 14 #include "util/parse-events.h" 15 15 #include "util/cache.h" 16 16 #include "util/pmu.h" 17 - #include "util/parse-options.h" 17 + #include <subcmd/parse-options.h> 18 18 19 19 int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 20 20 {
+1 -1
tools/perf/builtin-lock.c
··· 9 9 #include "util/thread.h" 10 10 #include "util/header.h" 11 11 12 - #include "util/parse-options.h" 12 + #include <subcmd/parse-options.h> 13 13 #include "util/trace-event.h" 14 14 15 15 #include "util/debug.h"
+1 -1
tools/perf/builtin-mem.c
··· 1 1 #include "builtin.h" 2 2 #include "perf.h" 3 3 4 - #include "util/parse-options.h" 4 + #include <subcmd/parse-options.h> 5 5 #include "util/trace-event.h" 6 6 #include "util/tool.h" 7 7 #include "util/session.h"
+1 -1
tools/perf/builtin-probe.c
··· 37 37 #include "util/strfilter.h" 38 38 #include "util/symbol.h" 39 39 #include "util/debug.h" 40 - #include "util/parse-options.h" 40 + #include <subcmd/parse-options.h> 41 41 #include "util/probe-finder.h" 42 42 #include "util/probe-event.h" 43 43 #include "util/probe-file.h"
+1 -1
tools/perf/builtin-record.c
··· 11 11 12 12 #include "util/build-id.h" 13 13 #include "util/util.h" 14 - #include "util/parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "util/parse-events.h" 16 16 17 17 #include "util/callchain.h"
+1 -1
tools/perf/builtin-report.c
··· 27 27 #include "util/session.h" 28 28 #include "util/tool.h" 29 29 30 - #include "util/parse-options.h" 30 + #include <subcmd/parse-options.h> 31 31 #include "util/parse-events.h" 32 32 33 33 #include "util/thread.h"
+1 -1
tools/perf/builtin-sched.c
··· 12 12 #include "util/tool.h" 13 13 #include "util/cloexec.h" 14 14 15 - #include "util/parse-options.h" 15 + #include <subcmd/parse-options.h> 16 16 #include "util/trace-event.h" 17 17 18 18 #include "util/debug.h"
+2 -2
tools/perf/builtin-script.c
··· 3 3 #include "perf.h" 4 4 #include "util/cache.h" 5 5 #include "util/debug.h" 6 - #include "util/exec_cmd.h" 6 + #include <subcmd/exec-cmd.h> 7 7 #include "util/header.h" 8 - #include "util/parse-options.h" 8 + #include <subcmd/parse-options.h> 9 9 #include "util/perf_regs.h" 10 10 #include "util/session.h" 11 11 #include "util/tool.h"
+1 -1
tools/perf/builtin-stat.c
··· 45 45 #include "builtin.h" 46 46 #include "util/cgroup.h" 47 47 #include "util/util.h" 48 - #include "util/parse-options.h" 48 + #include <subcmd/parse-options.h> 49 49 #include "util/parse-events.h" 50 50 #include "util/pmu.h" 51 51 #include "util/event.h"
+1 -1
tools/perf/builtin-timechart.c
··· 30 30 31 31 #include "perf.h" 32 32 #include "util/header.h" 33 - #include "util/parse-options.h" 33 + #include <subcmd/parse-options.h> 34 34 #include "util/parse-events.h" 35 35 #include "util/event.h" 36 36 #include "util/session.h"
+1 -1
tools/perf/builtin-top.c
··· 34 34 #include "util/top.h" 35 35 #include "util/util.h" 36 36 #include <linux/rbtree.h> 37 - #include "util/parse-options.h" 37 + #include <subcmd/parse-options.h> 38 38 #include "util/parse-events.h" 39 39 #include "util/cpumap.h" 40 40 #include "util/xyarray.h"
+2 -2
tools/perf/builtin-trace.c
··· 22 22 #include "util/color.h" 23 23 #include "util/debug.h" 24 24 #include "util/evlist.h" 25 - #include "util/exec_cmd.h" 25 + #include <subcmd/exec-cmd.h> 26 26 #include "util/machine.h" 27 27 #include "util/session.h" 28 28 #include "util/thread.h" 29 - #include "util/parse-options.h" 29 + #include <subcmd/parse-options.h> 30 30 #include "util/strlist.h" 31 31 #include "util/intlist.h" 32 32 #include "util/thread_map.h"
+3 -3
tools/perf/perf.c
··· 9 9 #include "builtin.h" 10 10 11 11 #include "util/env.h" 12 - #include "util/exec_cmd.h" 12 + #include <subcmd/exec-cmd.h> 13 13 #include "util/cache.h" 14 14 #include "util/quote.h" 15 - #include "util/run-command.h" 15 + #include <subcmd/run-command.h> 16 16 #include "util/parse-events.h" 17 - #include "util/parse-options.h" 17 + #include <subcmd/parse-options.h> 18 18 #include "util/bpf-loader.h" 19 19 #include "util/debug.h" 20 20 #include <api/fs/tracing_path.h>
+1 -1
tools/perf/tests/attr.c
··· 24 24 #include <linux/kernel.h> 25 25 #include "../perf.h" 26 26 #include "util.h" 27 - #include "exec_cmd.h" 27 + #include <subcmd/exec-cmd.h> 28 28 #include "tests.h" 29 29 30 30 #define ENV "PERF_TEST_ATTR"
+1 -1
tools/perf/tests/builtin-test.c
··· 11 11 #include "tests.h" 12 12 #include "debug.h" 13 13 #include "color.h" 14 - #include "parse-options.h" 14 + #include <subcmd/parse-options.h> 15 15 #include "symbol.h" 16 16 17 17 struct test __weak arch_tests[] = {
-7
tools/perf/util/Build
··· 9 9 libperf-y += event.o 10 10 libperf-y += evlist.o 11 11 libperf-y += evsel.o 12 - libperf-y += exec_cmd.o 13 12 libperf-y += find_next_bit.o 14 - libperf-y += help.o 15 13 libperf-y += kallsyms.o 16 14 libperf-y += levenshtein.o 17 15 libperf-y += llvm-utils.o 18 - libperf-y += parse-options.o 19 16 libperf-y += parse-events.o 20 17 libperf-y += perf_regs.o 21 18 libperf-y += path.o ··· 20 23 libperf-y += libstring.o 21 24 libperf-y += bitmap.o 22 25 libperf-y += hweight.o 23 - libperf-y += run-command.o 24 26 libperf-y += quote.o 25 27 libperf-y += strbuf.o 26 28 libperf-y += string.o ··· 28 32 libperf-y += top.o 29 33 libperf-y += usage.o 30 34 libperf-y += wrapper.o 31 - libperf-y += sigchain.o 32 35 libperf-y += dso.o 33 36 libperf-y += symbol.o 34 37 libperf-y += color.o 35 - libperf-y += pager.o 36 38 libperf-y += header.o 37 39 libperf-y += callchain.o 38 40 libperf-y += values.o ··· 82 88 libperf-y += parse-regs-options.o 83 89 libperf-y += term.o 84 90 libperf-y += help-unknown-cmd.o 85 - libperf-y += subcmd-config.o 86 91 87 92 libperf-$(CONFIG_LIBBPF) += bpf-loader.o 88 93 libperf-$(CONFIG_BPF_PROLOGUE) += bpf-prologue.o
+1 -1
tools/perf/util/auxtrace.c
··· 45 45 #include "event.h" 46 46 #include "session.h" 47 47 #include "debug.h" 48 - #include "parse-options.h" 48 + #include <subcmd/parse-options.h> 49 49 50 50 #include "intel-pt.h" 51 51 #include "intel-bts.h"
+1 -1
tools/perf/util/cache.h
··· 4 4 #include <stdbool.h> 5 5 #include "util.h" 6 6 #include "strbuf.h" 7 - #include "pager.h" 7 + #include <subcmd/pager.h> 8 8 #include "../perf.h" 9 9 #include "../ui/ui.h" 10 10
+1 -1
tools/perf/util/cgroup.c
··· 1 1 #include "util.h" 2 2 #include "../perf.h" 3 - #include "parse-options.h" 3 + #include <subcmd/parse-options.h> 4 4 #include "evsel.h" 5 5 #include "cgroup.h" 6 6 #include "evlist.h"
+1 -1
tools/perf/util/config.c
··· 10 10 */ 11 11 #include "util.h" 12 12 #include "cache.h" 13 - #include "exec_cmd.h" 13 + #include <subcmd/exec-cmd.h> 14 14 #include "util/hist.h" /* perf_hist_config */ 15 15 #include "util/llvm-utils.h" /* perf_llvm_config */ 16 16
+1 -1
tools/perf/util/evlist.c
··· 18 18 #include <unistd.h> 19 19 20 20 #include "parse-events.h" 21 - #include "parse-options.h" 21 + #include <subcmd/parse-options.h> 22 22 23 23 #include <sys/mman.h> 24 24
+1 -1
tools/perf/util/exec_cmd.c tools/lib/subcmd/exec-cmd.c
··· 7 7 #include <stdlib.h> 8 8 #include <stdio.h> 9 9 #include "subcmd-util.h" 10 - #include "exec_cmd.h" 10 + #include "exec-cmd.h" 11 11 #include "subcmd-config.h" 12 12 13 13 #define MAX_ARGS 32
tools/perf/util/exec_cmd.h tools/lib/subcmd/exec-cmd.h
+1 -1
tools/perf/util/help-unknown-cmd.c
··· 1 1 #include "cache.h" 2 - #include "help.h" 2 + #include <subcmd/help.h> 3 3 #include "../builtin.h" 4 4 #include "levenshtein.h" 5 5
+1 -1
tools/perf/util/help.c tools/lib/subcmd/help.c
··· 9 9 #include <dirent.h> 10 10 #include "subcmd-util.h" 11 11 #include "help.h" 12 - #include "exec_cmd.h" 12 + #include "exec-cmd.h" 13 13 14 14 void add_cmdname(struct cmdnames *cmds, const char *name, size_t len) 15 15 {
tools/perf/util/help.h tools/lib/subcmd/help.h
tools/perf/util/pager.c tools/lib/subcmd/pager.c
tools/perf/util/pager.h tools/lib/subcmd/pager.h
+1 -1
tools/perf/util/parse-branch-options.c
··· 1 1 #include "perf.h" 2 2 #include "util/util.h" 3 3 #include "util/debug.h" 4 - #include "util/parse-options.h" 4 + #include <subcmd/parse-options.h> 5 5 #include "util/parse-branch-options.h" 6 6 7 7 #define BRANCH_OPT(n, m) \
+2 -2
tools/perf/util/parse-events.c
··· 4 4 #include "../perf.h" 5 5 #include "evlist.h" 6 6 #include "evsel.h" 7 - #include "parse-options.h" 7 + #include <subcmd/parse-options.h> 8 8 #include "parse-events.h" 9 - #include "exec_cmd.h" 9 + #include <subcmd/exec-cmd.h> 10 10 #include "string.h" 11 11 #include "symbol.h" 12 12 #include "cache.h"
tools/perf/util/parse-options.c tools/lib/subcmd/parse-options.c
tools/perf/util/parse-options.h tools/lib/subcmd/parse-options.h
+1 -1
tools/perf/util/parse-regs-options.c
··· 1 1 #include "perf.h" 2 2 #include "util/util.h" 3 3 #include "util/debug.h" 4 - #include "util/parse-options.h" 4 + #include <subcmd/parse-options.h> 5 5 #include "util/parse-regs-options.h" 6 6 7 7 int
+1 -1
tools/perf/util/run-command.c tools/lib/subcmd/run-command.c
··· 7 7 #include <sys/wait.h> 8 8 #include "subcmd-util.h" 9 9 #include "run-command.h" 10 - #include "exec_cmd.h" 10 + #include "exec-cmd.h" 11 11 12 12 #define STRERR_BUFSIZE 128 13 13
tools/perf/util/run-command.h tools/lib/subcmd/run-command.h
tools/perf/util/sigchain.c tools/lib/subcmd/sigchain.c
tools/perf/util/sigchain.h tools/lib/subcmd/sigchain.h
+1 -1
tools/perf/util/sort.h
··· 18 18 #include "debug.h" 19 19 #include "header.h" 20 20 21 - #include "parse-options.h" 21 + #include <subcmd/parse-options.h> 22 22 #include "parse-events.h" 23 23 #include "hist.h" 24 24 #include "thread.h"
tools/perf/util/subcmd-config.c tools/lib/subcmd/subcmd-config.c
tools/perf/util/subcmd-config.h tools/lib/subcmd/subcmd-config.h
tools/perf/util/subcmd-util.h tools/lib/subcmd/subcmd-util.h