Commit fd4ebb45 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf build-id: Add build_id_cache__add function 



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.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20201126170026.2619053-22-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 75fb2af6

tools/perf/util/build-id.c

+27 −15
Original line number Diff line number Diff line
@@ -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,

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)

tools/perf/util/build-id.h

+2 −0
Original line number Diff line number Diff line
@@ -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);