Re: [PATCH 19/25] perf tools: Add __perf_session__cache_build_ids function

Arnaldo Carvalho de Melo
2020-11-26T17:53:18Z

Em Thu, Nov 26, 2020 at 06:00:20PM +0100, Jiri Olsa escreveu:
> Adding __perf_session__cache_build_ids function as an
> interface for caching sessions build ids with callback
> function and its data pointer.

Thanks, applied.

- Arnaldo

> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/build-id.c | 10 ++++++++--
> tools/perf/util/build-id.h | 3 +++
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
> index 948a7f48d668..6bf3cc79c5d5 100644
> --- a/tools/perf/util/build-id.c
> +++ b/tools/perf/util/build-id.c
> @@ -892,7 +892,8 @@ machines__for_each_dso(struct machines *machines, machine__dso_t fn, void *priv)
> return ret ? -1 : 0;
> }
>
> -int perf_session__cache_build_ids(struct perf_session *session)
> +int __perf_session__cache_build_ids(struct perf_session *session,
> + machine__dso_t fn, void *priv)
> {
> if (no_buildid_cache)
> return 0;
> @@ -900,7 +901,12 @@ int perf_session__cache_build_ids(struct perf_session *session)
> if (mkdir(buildid_dir, 0755) != 0 && errno != EEXIST)
> return -1;
>
> - return machines__for_each_dso(&session->machines, dso__cache_build_id, NULL) ? -1 : 0;
> + return machines__for_each_dso(&session->machines, fn, priv) ? -1 : 0;
> +}
> +
> +int perf_session__cache_build_ids(struct perf_session *session)
> +{
> + return __perf_session__cache_build_ids(session, dso__cache_build_id, NULL);
> }
>
> static bool machine__read_build_ids(struct machine *machine, bool with_hits)
> diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
> index f1a2f67df6e4..c6f10e3d2152 100644
> --- a/tools/perf/util/build-id.h
> +++ b/tools/perf/util/build-id.h
> @@ -5,6 +5,7 @@
> #define BUILD_ID_SIZE 20
> #define SBUILD_ID_SIZE (BUILD_ID_SIZE * 2 + 1)
>
> +#include "machine.h"
> #include "tool.h"
> #include <linux/types.h>
>
> @@ -46,6 +47,8 @@ bool perf_session__read_build_ids(struct perf_session *session, bool with_hits);
> int perf_session__write_buildid_table(struct perf_session *session,
> struct feat_fd *fd);
> int perf_session__cache_build_ids(struct perf_session *session);
> +int __perf_session__cache_build_ids(struct perf_session *session,
> + machine__dso_t fn, void *priv);
>
> char *build_id_cache__origname(const char *sbuild_id);
> char *build_id_cache__linkname(const char *sbuild_id, char *bf, size_t size);
> --
> 2.26.2
>

--

- Arnaldo