From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Ian Rogers <irogers@google.com>,
lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Song Liu <songliubraving@fb.com>,
Stephane Eranian <eranian@google.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>
Subject: Re: [PATCH 21/25] perf tools: Add build_id_cache__add function
Date: Thu, 26 Nov 2020 14:53:47 -0300 [thread overview]
Message-ID: <20201126175347.GH70905@kernel.org> (raw)
In-Reply-To: <20201126170026.2619053-22-jolsa@kernel.org>
Em Thu, Nov 26, 2020 at 06:00:22PM +0100, Jiri Olsa escreveu:
> Adding build_id_cache__add function as core function
> that adds file into build id database. It will be
> set from another callers in following changes.
Thanks, applied.
- Arnaldo
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/build-id.c | 42 ++++++++++++++++++++++++--------------
> tools/perf/util/build-id.h | 2 ++
> 2 files changed, 29 insertions(+), 15 deletions(-)
>
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index 6bf3cc79c5d5..02df36b30ac5 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -671,24 +671,15 @@ static char *build_id_cache__find_debug(const char *sbuild_id,
> return realname;
> }
>
> -int build_id_cache__add_s(const char *sbuild_id, const char *name,
> - struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
> +int
> +build_id_cache__add(const char *sbuild_id, const char *name, const char *realname,
> + struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
> {
> const size_t size = PATH_MAX;
> - char *realname = NULL, *filename = NULL, *dir_name = NULL,
> - *linkname = zalloc(size), *tmp;
> + char *filename = NULL, *dir_name = NULL, *linkname = zalloc(size), *tmp;
> char *debugfile = NULL;
> int err = -1;
>
> - if (!is_kallsyms) {
> - if (!is_vdso)
> - realname = nsinfo__realpath(name, nsi);
> - else
> - realname = realpath(name, NULL);
> - if (!realname)
> - goto out_free;
> - }
> -
> dir_name = build_id_cache__cachedir(sbuild_id, name, nsi, is_kallsyms,
> is_vdso);
> if (!dir_name)
> @@ -788,8 +779,6 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
> pr_debug4("Failed to update/scan SDT cache for %s\n", realname);
>
> out_free:
> - if (!is_kallsyms)
> - free(realname);
> free(filename);
> free(debugfile);
> free(dir_name);
> @@ -797,6 +786,29 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
> return err;
> }
>
> +int build_id_cache__add_s(const char *sbuild_id, const char *name,
> + struct nsinfo *nsi, bool is_kallsyms, bool is_vdso)
> +{
> + char *realname = NULL;
> + int err = -1;
> +
> + if (!is_kallsyms) {
> + if (!is_vdso)
> + realname = nsinfo__realpath(name, nsi);
> + else
> + realname = realpath(name, NULL);
> + if (!realname)
> + goto out_free;
> + }
> +
> + err = build_id_cache__add(sbuild_id, name, realname, nsi, is_kallsyms, is_vdso);
> +
> +out_free:
> + if (!is_kallsyms)
> + free(realname);
> + return err;
> +}
> +
> static int build_id_cache__add_b(const struct build_id *bid,
> const char *name, struct nsinfo *nsi,
> bool is_kallsyms, bool is_vdso)
> diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
> index c6f10e3d2152..02613f4b2c29 100644
> --- a/tools/perf/util/build-id.h
> +++ b/tools/perf/util/build-id.h
> @@ -63,6 +63,8 @@ char *build_id_cache__complement(const char *incomplete_sbuild_id);
> int build_id_cache__list_build_ids(const char *pathname, struct nsinfo *nsi,
> struct strlist **result);
> bool build_id_cache__cached(const char *sbuild_id);
> +int build_id_cache__add(const char *sbuild_id, const char *name, const char *realname,
> + struct nsinfo *nsi, bool is_kallsyms, bool is_vdso);
> int build_id_cache__add_s(const char *sbuild_id,
> const char *name, struct nsinfo *nsi,
> bool is_kallsyms, bool is_vdso);
> --
> 2.26.2
>
--
- Arnaldo
next prev parent reply other threads:[~2020-11-26 17:54 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 17:00 [PATCHv4 00/25] perf: Add mmap2 build id support Jiri Olsa
2020-11-26 17:00 ` [PATCH 01/25] bpf: Move stack_map_get_build_id into lib Jiri Olsa
2020-11-26 17:00 ` [PATCH 02/25] bpf: Add size arg to build_id_parse function Jiri Olsa
2020-12-03 19:24 ` Jiri Olsa
2020-12-03 21:23 ` Song Liu
2020-12-04 23:30 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 03/25] perf: Add build id data in mmap2 event Jiri Olsa
2020-11-26 17:00 ` [PATCH 04/25] tools headers uapi: Sync tools/include/uapi/linux/perf_event.h Jiri Olsa
2020-11-26 17:00 ` [PATCH 05/25] tools lib: Adopt memchr_inv() from kernel Jiri Olsa
2020-11-26 17:42 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 06/25] perf tools: Do not swap mmap2 fields in case it contains build id Jiri Olsa
2020-11-26 17:30 ` Arnaldo Carvalho de Melo
2020-11-27 19:46 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 07/25] perf tools: Add build_id__is_defined function Jiri Olsa
2020-11-26 17:43 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 08/25] perf tools: Add filename__decompress function Jiri Olsa
2020-11-26 17:44 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 09/25] perf tools: Add support to read build id from compressed elf Jiri Olsa
2020-11-26 17:46 ` Arnaldo Carvalho de Melo
2020-11-27 19:45 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 10/25] perf tools: Add check for existing link in buildid dir Jiri Olsa
2020-11-26 17:47 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 11/25] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event Jiri Olsa
2020-11-26 17:48 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 12/25] perf tools: Try to load vmlinux from buildid database Jiri Olsa
2020-11-26 17:50 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 13/25] perf tools: Store build id from mmap2 events Jiri Olsa
2020-11-26 17:00 ` [PATCH 14/25] perf tools: Allow mmap2 event to synthesize kernel image Jiri Olsa
2020-11-26 17:00 ` [PATCH 15/25] perf tools: Allow mmap2 event to synthesize modules Jiri Olsa
2020-11-26 17:00 ` [PATCH 16/25] perf tools: Synthesize build id for kernel/modules/tasks Jiri Olsa
2020-11-26 17:00 ` [PATCH 17/25] perf tools: Add support to display build id for mmap2 events Jiri Olsa
2020-11-26 17:00 ` [PATCH 18/25] perf tools: Use machine__for_each_dso in perf_session__cache_build_ids Jiri Olsa
2020-11-26 17:52 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 19/25] perf tools: Add __perf_session__cache_build_ids function Jiri Olsa
2020-11-26 17:53 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 20/25] perf tools: Add is_perf_data function Jiri Olsa
2020-11-26 17:51 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 21/25] perf tools: Add build_id_cache__add function Jiri Olsa
2020-11-26 17:53 ` Arnaldo Carvalho de Melo [this message]
2020-11-26 17:00 ` [PATCH 22/25] perf buildid-cache: Add support to add build ids from perf data Jiri Olsa
2020-11-26 17:57 ` Arnaldo Carvalho de Melo
2020-11-27 19:49 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 23/25] perf buildid-cache: Add --debuginfod option Jiri Olsa
2020-11-26 17:00 ` [PATCH 24/25] perf buildid-list: Add support for mmap2's buildid events Jiri Olsa
2020-11-26 17:00 ` [PATCH 25/25] perf record: Add --buildid-mmap option to enable mmap's build id Jiri Olsa
2020-11-26 17:40 ` Arnaldo Carvalho de Melo
2020-11-27 4:41 ` [PATCHv4 00/25] perf: Add mmap2 build id support Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2020-11-23 23:04 [PATCHv3 " Jiri Olsa
2020-11-23 23:05 ` [PATCH 21/25] perf tools: Add build_id_cache__add function Jiri Olsa
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=20201126175347.GH70905@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=songliubraving@fb.com \
/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