libperf: Move to tools/lib/perf

Move libperf from its current location under tools/perf to a separate directory under tools/lib/. Also change various paths (mainly includes) to reflect the libperf move to a separate directory and add a new directory under MANIFEST. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Michael Petlan <mpetlan@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20191206210612.8676-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
mariux64 · Jan 6, 2020 · 3ce311a · 3ce311a
1 parent 6ae9c10
commit 3ce311a
Show file tree

Hide file tree

Showing 39 changed files with 5 additions and 4 deletions.
diff --git a/tools/perf/lib/Build → tools/lib/perf/Build b/tools/perf/lib/Build → tools/lib/perf/Build
diff --git a/tools/perf/lib/Documentation/Makefile → tools/lib/perf/Documentation/Makefile b/tools/perf/lib/Documentation/Makefile → tools/lib/perf/Documentation/Makefile
diff --git a/tools/perf/lib/Documentation/man/libperf.rst → tools/lib/perf/Documentation/man/libperf.rst b/tools/perf/lib/Documentation/man/libperf.rst → tools/lib/perf/Documentation/man/libperf.rst
diff --git a/...f/lib/Documentation/tutorial/tutorial.rst → .../perf/Documentation/tutorial/tutorial.rst b/...f/lib/Documentation/tutorial/tutorial.rst → .../perf/Documentation/tutorial/tutorial.rst
diff --git a/tools/perf/lib/Makefile → tools/lib/perf/Makefile b/tools/perf/lib/Makefile → 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 → tools/lib/perf/core.c b/tools/perf/lib/core.c → tools/lib/perf/core.c
diff --git a/tools/perf/lib/cpumap.c → tools/lib/perf/cpumap.c b/tools/perf/lib/cpumap.c → tools/lib/perf/cpumap.c
diff --git a/tools/perf/lib/evlist.c → tools/lib/perf/evlist.c b/tools/perf/lib/evlist.c → tools/lib/perf/evlist.c
diff --git a/tools/perf/lib/evsel.c → tools/lib/perf/evsel.c b/tools/perf/lib/evsel.c → tools/lib/perf/evsel.c
diff --git a/tools/perf/lib/include/internal/cpumap.h → tools/lib/perf/include/internal/cpumap.h b/tools/perf/lib/include/internal/cpumap.h → tools/lib/perf/include/internal/cpumap.h
diff --git a/tools/perf/lib/include/internal/evlist.h → tools/lib/perf/include/internal/evlist.h b/tools/perf/lib/include/internal/evlist.h → tools/lib/perf/include/internal/evlist.h
diff --git a/tools/perf/lib/include/internal/evsel.h → tools/lib/perf/include/internal/evsel.h b/tools/perf/lib/include/internal/evsel.h → tools/lib/perf/include/internal/evsel.h
diff --git a/tools/perf/lib/include/internal/lib.h → tools/lib/perf/include/internal/lib.h b/tools/perf/lib/include/internal/lib.h → tools/lib/perf/include/internal/lib.h
diff --git a/tools/perf/lib/include/internal/mmap.h → tools/lib/perf/include/internal/mmap.h b/tools/perf/lib/include/internal/mmap.h → tools/lib/perf/include/internal/mmap.h
diff --git a/tools/perf/lib/include/internal/tests.h → tools/lib/perf/include/internal/tests.h b/tools/perf/lib/include/internal/tests.h → tools/lib/perf/include/internal/tests.h
diff --git a/tools/perf/lib/include/internal/threadmap.h → tools/lib/perf/include/internal/threadmap.h b/tools/perf/lib/include/internal/threadmap.h → tools/lib/perf/include/internal/threadmap.h
diff --git a/tools/perf/lib/include/internal/xyarray.h → tools/lib/perf/include/internal/xyarray.h b/tools/perf/lib/include/internal/xyarray.h → tools/lib/perf/include/internal/xyarray.h
diff --git a/tools/perf/lib/include/perf/core.h → tools/lib/perf/include/perf/core.h b/tools/perf/lib/include/perf/core.h → tools/lib/perf/include/perf/core.h
diff --git a/tools/perf/lib/include/perf/cpumap.h → tools/lib/perf/include/perf/cpumap.h b/tools/perf/lib/include/perf/cpumap.h → tools/lib/perf/include/perf/cpumap.h
diff --git a/tools/perf/lib/include/perf/event.h → tools/lib/perf/include/perf/event.h b/tools/perf/lib/include/perf/event.h → tools/lib/perf/include/perf/event.h
diff --git a/tools/perf/lib/include/perf/evlist.h → tools/lib/perf/include/perf/evlist.h b/tools/perf/lib/include/perf/evlist.h → tools/lib/perf/include/perf/evlist.h
diff --git a/tools/perf/lib/include/perf/evsel.h → tools/lib/perf/include/perf/evsel.h b/tools/perf/lib/include/perf/evsel.h → tools/lib/perf/include/perf/evsel.h
diff --git a/tools/perf/lib/include/perf/mmap.h → tools/lib/perf/include/perf/mmap.h b/tools/perf/lib/include/perf/mmap.h → tools/lib/perf/include/perf/mmap.h
diff --git a/tools/perf/lib/include/perf/threadmap.h → tools/lib/perf/include/perf/threadmap.h b/tools/perf/lib/include/perf/threadmap.h → tools/lib/perf/include/perf/threadmap.h
diff --git a/tools/perf/lib/internal.h → tools/lib/perf/internal.h b/tools/perf/lib/internal.h → tools/lib/perf/internal.h
diff --git a/tools/perf/lib/lib.c → tools/lib/perf/lib.c b/tools/perf/lib/lib.c → tools/lib/perf/lib.c
diff --git a/tools/perf/lib/libperf.map → tools/lib/perf/libperf.map b/tools/perf/lib/libperf.map → tools/lib/perf/libperf.map
diff --git a/tools/perf/lib/libperf.pc.template → tools/lib/perf/libperf.pc.template b/tools/perf/lib/libperf.pc.template → tools/lib/perf/libperf.pc.template
diff --git a/tools/perf/lib/mmap.c → tools/lib/perf/mmap.c b/tools/perf/lib/mmap.c → tools/lib/perf/mmap.c
diff --git a/tools/perf/lib/tests/Makefile → tools/lib/perf/tests/Makefile b/tools/perf/lib/tests/Makefile → 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 → tools/lib/perf/tests/test-cpumap.c b/tools/perf/lib/tests/test-cpumap.c → tools/lib/perf/tests/test-cpumap.c
diff --git a/tools/perf/lib/tests/test-evlist.c → tools/lib/perf/tests/test-evlist.c b/tools/perf/lib/tests/test-evlist.c → tools/lib/perf/tests/test-evlist.c
diff --git a/tools/perf/lib/tests/test-evsel.c → tools/lib/perf/tests/test-evsel.c b/tools/perf/lib/tests/test-evsel.c → tools/lib/perf/tests/test-evsel.c
diff --git a/tools/perf/lib/tests/test-threadmap.c → tools/lib/perf/tests/test-threadmap.c b/tools/perf/lib/tests/test-threadmap.c → tools/lib/perf/tests/test-threadmap.c
diff --git a/tools/perf/lib/threadmap.c → tools/lib/perf/threadmap.c b/tools/perf/lib/threadmap.c → tools/lib/perf/threadmap.c
diff --git a/tools/perf/lib/xyarray.c → tools/lib/perf/xyarray.c b/tools/perf/lib/xyarray.c → tools/lib/perf/xyarray.c
diff --git 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
@@ -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
@@ -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