Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b5a7935 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf buildid: Introduce sysfs/filename__sprintf_build_id 



Introduce sysfs/filename__sprintf_build_id for consolidating similar
code.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20150815114259.13642.34685.stgit@localhost.localdomain


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

tools/perf/builtin-buildid-cache.c

+2 −12
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)

{

	char root_dir[PATH_MAX];

	char notes[PATH_MAX];

	u8 build_id[BUILD_ID_SIZE];

	char *p;



	strlcpy(root_dir, proc_dir, sizeof(root_dir));
@@ -35,15 +33,7 @@ static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid) 
	if (!p)

		return -1;

	*p = '\0';



	scnprintf(notes, sizeof(notes), "%s/sys/kernel/notes", root_dir);



	if (sysfs__read_build_id(notes, build_id, sizeof(build_id)))

		return -1;



	build_id__sprintf(build_id, sizeof(build_id), sbuildid);



	return 0;

	return sysfs__sprintf_build_id(root_dir, sbuildid);

}



static int build_id_cache__kcore_dir(char *dir, size_t sz)
@@ -138,7 +128,7 @@ static int build_id_cache__add_kcore(const char *filename, bool force) 
		return -1;

	*p = '\0';



	if (build_id_cache__kcore_buildid(from_dir, sbuildid))

	if (build_id_cache__kcore_buildid(from_dir, sbuildid) < 0)

		return -1;



	scnprintf(to_dir, sizeof(to_dir), "%s/[kernel.kcore]/%s",

tools/perf/builtin-buildid-list.c

+10 −14
Original line number Diff line number Diff line
@@ -19,29 +19,25 @@ 


static int sysfs__fprintf_build_id(FILE *fp)

{

	u8 kallsyms_build_id[BUILD_ID_SIZE];

	char sbuild_id[SBUILD_ID_SIZE];

	int ret;



	if (sysfs__read_build_id("/sys/kernel/notes", kallsyms_build_id,

				 sizeof(kallsyms_build_id)) != 0)

		return -1;

	ret = sysfs__sprintf_build_id("/", sbuild_id);

	if (ret != sizeof(sbuild_id))

		return ret < 0 ? ret : -EINVAL;



	build_id__sprintf(kallsyms_build_id, sizeof(kallsyms_build_id),

			  sbuild_id);

	fprintf(fp, "%s\n", sbuild_id);

	return 0;

	return fprintf(fp, "%s\n", sbuild_id);

}



static int filename__fprintf_build_id(const char *name, FILE *fp)

{

	u8 build_id[BUILD_ID_SIZE];

	char sbuild_id[SBUILD_ID_SIZE];

	int ret;



	if (filename__read_build_id(name, build_id,

				    sizeof(build_id)) != sizeof(build_id))

		return 0;

	ret = filename__sprintf_build_id(name, sbuild_id);

	if (ret != sizeof(sbuild_id))

		return ret < 0 ? ret : -EINVAL;



	build_id__sprintf(build_id, sizeof(build_id), sbuild_id);

	return fprintf(fp, "%s\n", sbuild_id);

}
@@ -63,7 +59,7 @@ static int perf_session__list_build_ids(bool force, bool with_hits) 
	/*

	 * See if this is an ELF file first:

	 */

	if (filename__fprintf_build_id(input_name, stdout))

	if (filename__fprintf_build_id(input_name, stdout) > 0)

		goto out;



	session = perf_session__new(&file, false, &build_id__mark_dso_hit_ops);

tools/perf/util/build-id.c

+32 −0
Original line number Diff line number Diff line
@@ -93,6 +93,38 @@ int build_id__sprintf(const u8 *build_id, int len, char *bf) 
	return raw - build_id;

}



int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)

{

	char notes[PATH_MAX];

	u8 build_id[BUILD_ID_SIZE];

	int ret;



	if (!root_dir)

		root_dir = "";



	scnprintf(notes, sizeof(notes), "%s/sys/kernel/notes", root_dir);



	ret = sysfs__read_build_id(notes, build_id, sizeof(build_id));

	if (ret < 0)

		return ret;



	return build_id__sprintf(build_id, sizeof(build_id), sbuild_id);

}



int filename__sprintf_build_id(const char *pathname, char *sbuild_id)

{

	u8 build_id[BUILD_ID_SIZE];

	int ret;



	ret = filename__read_build_id(pathname, build_id, sizeof(build_id));

	if (ret < 0)

		return ret;

	else if (ret != sizeof(build_id))

		return -EINVAL;



	return build_id__sprintf(build_id, sizeof(build_id), sbuild_id);

}



/* asnprintf consolidates asprintf and snprintf */

static int asnprintf(char **strp, size_t size, const char *fmt, ...)

{

tools/perf/util/build-id.h

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ extern struct perf_tool build_id__mark_dso_hit_ops; 
struct dso;



int build_id__sprintf(const u8 *build_id, int len, char *bf);

int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id);

int filename__sprintf_build_id(const char *pathname, char *sbuild_id);



char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size);



int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event,