From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Masahiro Yamada <masahiroy@kernel.org>,
Nicolas Schier <nicolas@fjasle.eu>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
bpf@vger.kernel.org, Nick Desaulniers <ndesaulniers@google.com>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH v1 00/14] Fix perf tools/lib includes
Date: Mon, 7 Nov 2022 23:35:04 -0800 [thread overview]
Message-ID: <20221108073518.1154450-1-irogers@google.com> (raw)
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/
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/Makefile.config | 2 -
tools/perf/Makefile.perf | 152 ++++++++++++------
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 -
32 files changed, 361 insertions(+), 86 deletions(-)
create mode 100644 tools/lib/symbol/Build
create mode 100644 tools/lib/symbol/Makefile
--
2.38.1.431.g37b22c650d-goog
next reply other threads:[~2022-11-08 7:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 7:35 Ian Rogers [this message]
2022-11-08 7:35 ` [PATCH v1 01/14] tools lib api: Add install target Ian Rogers
2022-11-08 7:35 ` [PATCH v1 02/14] tools lib subcmd: " Ian Rogers
2022-11-08 7:35 ` [PATCH v1 03/14] perf build: Install libsubcmd locally when building Ian Rogers
2022-11-08 7:35 ` [PATCH v1 04/14] perf build: Install libapi " Ian Rogers
2022-11-08 7:35 ` [PATCH v1 05/14] perf build: Install libperf " Ian Rogers
2022-11-08 7:35 ` [PATCH v1 06/14] perf build: Install libtraceevent " Ian Rogers
2022-11-08 7:35 ` [PATCH v1 07/14] tools lib api: Add missing install headers Ian Rogers
2022-11-08 7:35 ` [PATCH v1 08/14] tools lib perf: " Ian Rogers
2022-11-08 7:35 ` [PATCH v1 09/14] tool lib symbol: Add Makefile/Build Ian Rogers
2022-11-08 7:35 ` [PATCH v1 10/14] perf build: Install libsymbol locally when building Ian Rogers
2022-11-08 7:35 ` [PATCH v1 11/14] perf expr: Tidy hashmap dependency Ian Rogers
2022-11-08 7:35 ` [PATCH v1 12/14] perf thread_map: Reduce exposure of libperf internal API Ian Rogers
2022-11-08 7:35 ` [PATCH v1 13/14] perf cpumap: Tidy libperf includes Ian Rogers
2022-11-08 7:35 ` [PATCH v1 14/14] perf build: Use tools/lib headers from install path Ian Rogers
2022-11-09 15:27 ` [PATCH v1 00/14] Fix perf tools/lib includes Arnaldo Carvalho de Melo
2022-11-09 16:52 ` Ian Rogers
2022-11-09 16:57 ` Ian Rogers
2022-11-09 18:27 ` Arnaldo Carvalho de Melo
2022-11-15 21:28 ` Ian Rogers
2022-11-09 18:00 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221108073518.1154450-1-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=andrii.nakryiko@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).