diff options
| -rw-r--r-- | tools/lib/perf/Build (renamed from tools/perf/lib/Build) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/Documentation/Makefile (renamed from tools/perf/lib/Documentation/Makefile) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/Documentation/man/libperf.rst (renamed from tools/perf/lib/Documentation/man/libperf.rst) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/Documentation/tutorial/tutorial.rst (renamed from tools/perf/lib/Documentation/tutorial/tutorial.rst) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/Makefile (renamed from tools/perf/lib/Makefile) | 2 | ||||
| -rw-r--r-- | tools/lib/perf/core.c (renamed from tools/perf/lib/core.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/cpumap.c (renamed from tools/perf/lib/cpumap.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/evlist.c (renamed from tools/perf/lib/evlist.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/evsel.c (renamed from tools/perf/lib/evsel.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/cpumap.h (renamed from tools/perf/lib/include/internal/cpumap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/evlist.h (renamed from tools/perf/lib/include/internal/evlist.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/evsel.h (renamed from tools/perf/lib/include/internal/evsel.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/lib.h (renamed from tools/perf/lib/include/internal/lib.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/mmap.h (renamed from tools/perf/lib/include/internal/mmap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/tests.h (renamed from tools/perf/lib/include/internal/tests.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/threadmap.h (renamed from tools/perf/lib/include/internal/threadmap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/internal/xyarray.h (renamed from tools/perf/lib/include/internal/xyarray.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/core.h (renamed from tools/perf/lib/include/perf/core.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/cpumap.h (renamed from tools/perf/lib/include/perf/cpumap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/event.h (renamed from tools/perf/lib/include/perf/event.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/evlist.h (renamed from tools/perf/lib/include/perf/evlist.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/evsel.h (renamed from tools/perf/lib/include/perf/evsel.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/mmap.h (renamed from tools/perf/lib/include/perf/mmap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/include/perf/threadmap.h (renamed from tools/perf/lib/include/perf/threadmap.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/internal.h (renamed from tools/perf/lib/internal.h) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/lib.c (renamed from tools/perf/lib/lib.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/libperf.map (renamed from tools/perf/lib/libperf.map) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/libperf.pc.template (renamed from tools/perf/lib/libperf.pc.template) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/mmap.c (renamed from tools/perf/lib/mmap.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/tests/Makefile (renamed from tools/perf/lib/tests/Makefile) | 2 | ||||
| -rw-r--r-- | tools/lib/perf/tests/test-cpumap.c (renamed from tools/perf/lib/tests/test-cpumap.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/tests/test-evlist.c (renamed from tools/perf/lib/tests/test-evlist.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/tests/test-evsel.c (renamed from tools/perf/lib/tests/test-evsel.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/tests/test-threadmap.c (renamed from tools/perf/lib/tests/test-threadmap.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/threadmap.c (renamed from tools/perf/lib/threadmap.c) | 0 | ||||
| -rw-r--r-- | tools/lib/perf/xyarray.c (renamed from tools/perf/lib/xyarray.c) | 0 | ||||
| -rw-r--r-- | tools/perf/MANIFEST | 1 | ||||
| -rw-r--r-- | tools/perf/Makefile.config | 2 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 2 |
39 files changed, 5 insertions, 4 deletions
diff --git a/tools/perf/lib/Build b/tools/lib/perf/Build index 2ef9a4ec6d99..2ef9a4ec6d99 100644 --- a/tools/perf/lib/Build +++ b/tools/lib/perf/Build diff --git a/tools/perf/lib/Documentation/Makefile b/tools/lib/perf/Documentation/Makefile index 586425a88795..586425a88795 100644 --- a/tools/perf/lib/Documentation/Makefile +++ b/tools/lib/perf/Documentation/Makefile diff --git a/tools/perf/lib/Documentation/man/libperf.rst b/tools/lib/perf/Documentation/man/libperf.rst index 09a270fccb9c..09a270fccb9c 100644 --- a/tools/perf/lib/Documentation/man/libperf.rst +++ b/tools/lib/perf/Documentation/man/libperf.rst diff --git a/tools/perf/lib/Documentation/tutorial/tutorial.rst b/tools/lib/perf/Documentation/tutorial/tutorial.rst index 7be7bc27b385..7be7bc27b385 100644 --- a/tools/perf/lib/Documentation/tutorial/tutorial.rst +++ b/tools/lib/perf/Documentation/tutorial/tutorial.rst diff --git a/tools/perf/lib/Makefile b/tools/lib/perf/Makefile index 0f233638ef1f..768dd423730b 100644 --- a/tools/perf/lib/Makefile +++ b/tools/lib/perf/Makefile @@ -60,7 +60,7 @@ else endif INCLUDES = \ --I$(srctree)/tools/perf/lib/include \ +-I$(srctree)/tools/lib/perf/include \ -I$(srctree)/tools/lib/ \ -I$(srctree)/tools/include \ -I$(srctree)/tools/arch/$(SRCARCH)/include/ \ diff --git a/tools/perf/lib/core.c b/tools/lib/perf/core.c index 58fc894b76c5..58fc894b76c5 100644 --- a/tools/perf/lib/core.c +++ b/tools/lib/perf/core.c diff --git a/tools/perf/lib/cpumap.c b/tools/lib/perf/cpumap.c index f93f4e703e4c..f93f4e703e4c 100644 --- a/tools/perf/lib/cpumap.c +++ b/tools/lib/perf/cpumap.c diff --git a/tools/perf/lib/evlist.c b/tools/lib/perf/evlist.c index ae9e65aa2491..ae9e65aa2491 100644 --- a/tools/perf/lib/evlist.c +++ b/tools/lib/perf/evlist.c diff --git a/tools/perf/lib/evsel.c b/tools/lib/perf/evsel.c index 4dc06289f4c7..4dc06289f4c7 100644 --- a/tools/perf/lib/evsel.c +++ b/tools/lib/perf/evsel.c diff --git a/tools/perf/lib/include/internal/cpumap.h b/tools/lib/perf/include/internal/cpumap.h index 840d4032587b..840d4032587b 100644 --- a/tools/perf/lib/include/internal/cpumap.h +++ b/tools/lib/perf/include/internal/cpumap.h diff --git a/tools/perf/lib/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h index 74dc8c3f0b66..74dc8c3f0b66 100644 --- a/tools/perf/lib/include/internal/evlist.h +++ b/tools/lib/perf/include/internal/evlist.h diff --git a/tools/perf/lib/include/internal/evsel.h b/tools/lib/perf/include/internal/evsel.h index 1ffd083b235e..1ffd083b235e 100644 --- a/tools/perf/lib/include/internal/evsel.h +++ b/tools/lib/perf/include/internal/evsel.h diff --git a/tools/perf/lib/include/internal/lib.h b/tools/lib/perf/include/internal/lib.h index 5175d491b2d4..5175d491b2d4 100644 --- a/tools/perf/lib/include/internal/lib.h +++ b/tools/lib/perf/include/internal/lib.h diff --git a/tools/perf/lib/include/internal/mmap.h b/tools/lib/perf/include/internal/mmap.h index be7556e0a2b2..be7556e0a2b2 100644 --- a/tools/perf/lib/include/internal/mmap.h +++ b/tools/lib/perf/include/internal/mmap.h diff --git a/tools/perf/lib/include/internal/tests.h b/tools/lib/perf/include/internal/tests.h index 2093e8868a67..2093e8868a67 100644 --- a/tools/perf/lib/include/internal/tests.h +++ b/tools/lib/perf/include/internal/tests.h diff --git a/tools/perf/lib/include/internal/threadmap.h b/tools/lib/perf/include/internal/threadmap.h index df748baf9eda..df748baf9eda 100644 --- a/tools/perf/lib/include/internal/threadmap.h +++ b/tools/lib/perf/include/internal/threadmap.h diff --git a/tools/perf/lib/include/internal/xyarray.h b/tools/lib/perf/include/internal/xyarray.h index 51e35d6c8ec4..51e35d6c8ec4 100644 --- a/tools/perf/lib/include/internal/xyarray.h +++ b/tools/lib/perf/include/internal/xyarray.h diff --git a/tools/perf/lib/include/perf/core.h b/tools/lib/perf/include/perf/core.h index a3f6d68edad7..a3f6d68edad7 100644 --- a/tools/perf/lib/include/perf/core.h +++ b/tools/lib/perf/include/perf/core.h diff --git a/tools/perf/lib/include/perf/cpumap.h b/tools/lib/perf/include/perf/cpumap.h index 6a17ad730cbc..6a17ad730cbc 100644 --- a/tools/perf/lib/include/perf/cpumap.h +++ b/tools/lib/perf/include/perf/cpumap.h diff --git a/tools/perf/lib/include/perf/event.h b/tools/lib/perf/include/perf/event.h index 18106899cb4e..18106899cb4e 100644 --- a/tools/perf/lib/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h diff --git a/tools/perf/lib/include/perf/evlist.h b/tools/lib/perf/include/perf/evlist.h index 0a7479dc13bf..0a7479dc13bf 100644 --- a/tools/perf/lib/include/perf/evlist.h +++ b/tools/lib/perf/include/perf/evlist.h diff --git a/tools/perf/lib/include/perf/evsel.h b/tools/lib/perf/include/perf/evsel.h index c82ec39a4ad0..c82ec39a4ad0 100644 --- a/tools/perf/lib/include/perf/evsel.h +++ b/tools/lib/perf/include/perf/evsel.h diff --git a/tools/perf/lib/include/perf/mmap.h b/tools/lib/perf/include/perf/mmap.h index 9508ad90d8b9..9508ad90d8b9 100644 --- a/tools/perf/lib/include/perf/mmap.h +++ b/tools/lib/perf/include/perf/mmap.h diff --git a/tools/perf/lib/include/perf/threadmap.h b/tools/lib/perf/include/perf/threadmap.h index a7c50de8d010..a7c50de8d010 100644 --- a/tools/perf/lib/include/perf/threadmap.h +++ b/tools/lib/perf/include/perf/threadmap.h diff --git a/tools/perf/lib/internal.h b/tools/lib/perf/internal.h index 2c27e158de6b..2c27e158de6b 100644 --- a/tools/perf/lib/internal.h +++ b/tools/lib/perf/internal.h diff --git a/tools/perf/lib/lib.c b/tools/lib/perf/lib.c index 18658931fc71..18658931fc71 100644 --- a/tools/perf/lib/lib.c +++ b/tools/lib/perf/lib.c diff --git a/tools/perf/lib/libperf.map b/tools/lib/perf/libperf.map index 7be1af8a546c..7be1af8a546c 100644 --- a/tools/perf/lib/libperf.map +++ b/tools/lib/perf/libperf.map diff --git a/tools/perf/lib/libperf.pc.template b/tools/lib/perf/libperf.pc.template index 117e4a237b55..117e4a237b55 100644 --- a/tools/perf/lib/libperf.pc.template +++ b/tools/lib/perf/libperf.pc.template diff --git a/tools/perf/lib/mmap.c b/tools/lib/perf/mmap.c index 79d5ed6c38cc..79d5ed6c38cc 100644 --- a/tools/perf/lib/mmap.c +++ b/tools/lib/perf/mmap.c diff --git a/tools/perf/lib/tests/Makefile b/tools/lib/perf/tests/Makefile index a43cd08c5c03..96841775feaf 100644 --- a/tools/perf/lib/tests/Makefile +++ b/tools/lib/perf/tests/Makefile @@ -16,7 +16,7 @@ all: include $(srctree)/tools/scripts/Makefile.include -INCLUDE = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/lib +INCLUDE = -I$(srctree)/tools/lib/perf/include -I$(srctree)/tools/include -I$(srctree)/tools/lib $(TESTS_A): FORCE $(QUIET_LINK)$(CC) $(INCLUDE) $(CFLAGS) -o $@ $(subst -a,.c,$@) ../libperf.a $(LIBAPI) diff --git a/tools/perf/lib/tests/test-cpumap.c b/tools/lib/perf/tests/test-cpumap.c index c8d45091e7c2..c8d45091e7c2 100644 --- a/tools/perf/lib/tests/test-cpumap.c +++ b/tools/lib/perf/tests/test-cpumap.c diff --git a/tools/perf/lib/tests/test-evlist.c b/tools/lib/perf/tests/test-evlist.c index 6d8ebe0c2504..6d8ebe0c2504 100644 --- a/tools/perf/lib/tests/test-evlist.c +++ b/tools/lib/perf/tests/test-evlist.c diff --git a/tools/perf/lib/tests/test-evsel.c b/tools/lib/perf/tests/test-evsel.c index 135722ac965b..135722ac965b 100644 --- a/tools/perf/lib/tests/test-evsel.c +++ b/tools/lib/perf/tests/test-evsel.c diff --git a/tools/perf/lib/tests/test-threadmap.c b/tools/lib/perf/tests/test-threadmap.c index 7dc4d6fbedde..7dc4d6fbedde 100644 --- a/tools/perf/lib/tests/test-threadmap.c +++ b/tools/lib/perf/tests/test-threadmap.c diff --git a/tools/perf/lib/threadmap.c b/tools/lib/perf/threadmap.c index e92c368b0a6c..e92c368b0a6c 100644 --- a/tools/perf/lib/threadmap.c +++ b/tools/lib/perf/threadmap.c diff --git a/tools/perf/lib/xyarray.c b/tools/lib/perf/xyarray.c index dcd901d154bb..dcd901d154bb 100644 --- a/tools/perf/lib/xyarray.c +++ b/tools/lib/perf/xyarray.c diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 4934edb5adfd..5d7b947320fb 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -7,6 +7,7 @@ tools/lib/traceevent tools/lib/api tools/lib/bpf tools/lib/subcmd +tools/lib/perf tools/lib/argv_split.c tools/lib/ctype.c tools/lib/hweight.c diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index c90f4146e5a2..80e55e796be9 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -286,7 +286,7 @@ ifeq ($(DEBUG),0) endif endif -INC_FLAGS += -I$(src-perf)/lib/include +INC_FLAGS += -I$(srctree)/tools/lib/perf/include INC_FLAGS += -I$(src-perf)/util/include INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include INC_FLAGS += -I$(srctree)/tools/include/ diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index eae5d5e95952..3eda9d4b88e7 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -230,7 +230,7 @@ LIB_DIR = $(srctree)/tools/lib/api/ TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/ BPF_DIR = $(srctree)/tools/lib/bpf/ SUBCMD_DIR = $(srctree)/tools/lib/subcmd/ -LIBPERF_DIR = $(srctree)/tools/perf/lib/ +LIBPERF_DIR = $(srctree)/tools/lib/perf/ # Set FEATURE_TESTS to 'all' so all possible feature checkers are executed. # Without this setting the output feature dump file misses some features, for |