Skip to content

Fix perf tools/lib includes

Ian Rogers bpf linux-perf-users lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest14 patches 6 repliesIn review
  2. v114 patches 6 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14tools lib api: Add install targettools/lib/api/Makefile+49 -00 replies
2/14tools lib subcmd: Add install targettools/lib/subcmd/Makefile+49 -00 replies
3/14perf build: Install libsubcmd locally when buildingtools/perf/.gitignore tools/perf/Makefile.perf+17 -80 replies
4/14perf build: Install libapi locally when buildingtools/perf/.gitignore tools/perf/Makefile.perf+16 -120 replies
5/14perf build: Install libperf locally when buildingtools/perf/.gitignore tools/perf/Makefile.perf+15 -70 replies
6/14perf build: Install libtraceevent locally when buildingtools/perf/.gitignore tools/perf/Makefile.perf+40 -200 replies
7/14tools lib api: Add missing install headerstools/lib/api/Makefile+4 -10 replies
8/14tools lib perf: Add missing install headerstools/lib/perf/Makefile+9 -13 replies
9/14tool lib symbol: Add Makefile/Buildtools/lib/symbol/Build tools/lib/symbol/Makefile+116 -00 replies
10/14perf build: Install libsymbol locally when buildingtools/perf/.gitignore tools/perf/MANIFEST tools/perf/Makefile.perf +1 more+24 -100 replies
11/14perf expr: Tidy hashmap dependencytools/perf/tests/expr.c tools/perf/tests/pmu-events.c tools/perf/util/bpf-loader.c +6 more+6 -180 replies
12/14perf thread_map: Reduce exposure of libperf internal APItools/perf/builtin-stat.c tools/perf/builtin-trace.c tools/perf/tests/openat-syscall.c +7 more+12 -90 replies
13/14perf cpumap: Tidy libperf includestools/perf/tests/cpumap.c tools/perf/util/auxtrace.h tools/perf/util/cpumap.c +2 more+4 -50 replies
14/14perf build: Use tools/lib headers from install pathtools/perf/Makefile.config tools/perf/Makefile.perf+46 -20 replies

Reviews trailers per patch

None of the 14 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchNamhyung Kim
SeriesA-b
1/14
2/14
3/14
4/14
5/14
6/14
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/14] Fix perf tools/lib includes

The previous build would add -Itools/lib and get dependencies for libtraceevent, libsubcmd, libsymbol, libapi and libbpf meaning that overriding these libraries would change the link time dependency but the headers would erroneously come from tools/lib. Fix the build to install headers and then depend on these. To reduce exposing internal headers/APIs some clean up is performed. tools/lib/symbol has a Makefile added, while tools/lib/api and tools/lib/subcmd have install targets added. The pattern used for the dependencies in Makefile.perf is modelled on libbpf.

The problem and solution were motivated by this issue and discussion:
https://lore.kernel.org/lkml/CAEf4BzbbOHQZUAe6iWaehKCPQAf3VC=hq657buqe2_yRKxaK-A@mail.gmail.com/

v2. Fix a MANIFEST issue for the source tar ball. Add dependencies for
the installed header files so that the build doesn't overtake building these dependencies. Both issues reported by Arnaldo Carvalho de Melo <[email protected]>.

Ian Rogers (14):
tools lib api: Add install target
tools lib subcmd: Add install target
perf build: Install libsubcmd locally when building perf build: Install libapi locally when building perf build: Install libperf locally when building perf build: Install libtraceevent locally when building tools lib api: Add missing install headers tools lib perf: Add missing install headers tool lib symbol: Add Makefile/Build
perf build: Install libsymbol locally when building perf expr: Tidy hashmap dependency
perf thread_map: Reduce exposure of libperf internal API perf cpumap: Tidy libperf includes
perf build: Use tools/lib headers from install path

 tools/lib/api/Makefile                        |  52 +++++
 tools/lib/perf/Makefile                       |  10 +-
 tools/lib/subcmd/Makefile                     |  49 +++++
 tools/lib/symbol/Build                        |   1 +
 tools/lib/symbol/Makefile                     | 115 +++++++++++
 tools/perf/.gitignore                         |   7 +-
 tools/perf/MANIFEST                           |   3 +-
 tools/perf/Makefile.config                    |   2 -
 tools/perf/Makefile.perf                      | 192 ++++++++++++++----
 tools/perf/builtin-stat.c                     |   1 +
 tools/perf/builtin-trace.c                    |   4 +-
 tools/perf/tests/cpumap.c                     |   2 +-
 tools/perf/tests/expr.c                       |   1 +
 tools/perf/tests/openat-syscall.c             |   1 +
 tools/perf/tests/pmu-events.c                 |   1 +
 tools/perf/tests/thread-map.c                 |   1 +
 tools/perf/util/Build                         |   5 -
 tools/perf/util/auxtrace.h                    |   2 +-
 tools/perf/util/bpf-loader.c                  |   4 -
 tools/perf/util/bpf_counter.c                 |   2 +-
 tools/perf/util/cpumap.c                      |   1 +
 tools/perf/util/cpumap.h                      |   2 +-
 tools/perf/util/evsel.c                       |   5 +-
 tools/perf/util/evsel.h                       |   2 -
 tools/perf/util/expr.c                        |   1 +
 tools/perf/util/expr.h                        |   7 +-
 tools/perf/util/metricgroup.c                 |   1 +
 tools/perf/util/python.c                      |   6 +-
 .../scripting-engines/trace-event-python.c    |   2 +-
 tools/perf/util/stat-shadow.c                 |   1 +
 tools/perf/util/stat.c                        |   4 -
 tools/perf/util/thread_map.c                  |   1 +
 tools/perf/util/thread_map.h                  |   2 -
 33 files changed, 402 insertions(+), 88 deletions(-)
 create mode 100644 tools/lib/symbol/Build
 create mode 100644 tools/lib/symbol/Makefile
Signature · 1 line
2.38.1.431.g37b22c650d-goog