adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf symbols: Factor out buildid reading routine

Browse source 
So that we can run it without having a DSO instance.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1257291970-8208-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-11-03 21:46:10 -02:00 committed by Ingo Molnar
parent a2e7127153
commit 2643ce1145
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tools/perf/util/symbol.c
View file

@ -825,27 +825,27 @@ out_close:
return err; return err;
} }
#define BUILD_ID_SIZE 128 #define BUILD_ID_SIZE 20
static char *dso__read_build_id(struct dso *self) int filename__read_build_id(const char *filename, void *bf, size_t size)
{ {
int i; int fd, err = -1;
GElf_Ehdr ehdr; GElf_Ehdr ehdr;
GElf_Shdr shdr; GElf_Shdr shdr;
Elf_Data *build_id_data; Elf_Data *build_id_data;
Elf_Scn *sec; Elf_Scn *sec;
char *build_id = NULL, *bid;
unsigned char *raw;
Elf *elf; Elf *elf;
int fd = open(self->long_name, O_RDONLY);
if (size < BUILD_ID_SIZE)
goto out;
fd = open(filename, O_RDONLY);
if (fd < 0) if (fd < 0)
goto out; goto out;
elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
if (elf == NULL) { if (elf == NULL) {
pr_err("%s: cannot read %s ELF file.\n", __func__, pr_err("%s: cannot read %s ELF file.\n", __func__, filename);
self->long_name);
goto out_close; goto out_close;
} }
@ -854,29 +854,46 @@ static char *dso__read_build_id(struct dso *self)
goto out_elf_end; goto out_elf_end;
} }
sec = elf_section_by_name(elf, &ehdr, &shdr, ".note.gnu.build-id", NULL); sec = elf_section_by_name(elf, &ehdr, &shdr,
".note.gnu.build-id", NULL);
if (sec == NULL) if (sec == NULL)
goto out_elf_end; goto out_elf_end;
build_id_data = elf_getdata(sec, NULL); build_id_data = elf_getdata(sec, NULL);
if (build_id_data == NULL) if (build_id_data == NULL)
goto out_elf_end; goto out_elf_end;
build_id = malloc(BUILD_ID_SIZE); memcpy(bf, build_id_data->d_buf + 16, BUILD_ID_SIZE);
err = BUILD_ID_SIZE;
out_elf_end:
elf_end(elf);
out_close:
close(fd);
out:
return err;
}
static char *dso__read_build_id(struct dso *self)
{
int i, len;
char *build_id = NULL, *bid;
unsigned char rawbf[BUILD_ID_SIZE], *raw;
len = filename__read_build_id(self->long_name, rawbf, sizeof(rawbf));
if (len < 0)
goto out;
build_id = malloc(len * 2 + 1);
if (build_id == NULL) if (build_id == NULL)
goto out_elf_end; goto out;
raw = build_id_data->d_buf + 16;
bid = build_id; bid = build_id;
for (i = 0; i < 20; ++i) { raw = rawbf;
for (i = 0; i < len; ++i) {
sprintf(bid, "%02x", *raw); sprintf(bid, "%02x", *raw);
++raw; ++raw;
bid += 2; bid += 2;
} }
pr_debug2("%s(%s): %s\n", __func__, self->long_name, build_id); pr_debug2("%s(%s): %s\n", __func__, self->long_name, build_id);
out_elf_end:
elf_end(elf);
out_close:
close(fd);
out: out:
return build_id; return build_id;
} }

2
tools/perf/util/symbol.h
View file

@ -82,6 +82,8 @@ void dsos__fprintf(FILE *fp);
size_t dso__fprintf(struct dso *self, FILE *fp); size_t dso__fprintf(struct dso *self, FILE *fp);
char dso__symtab_origin(const struct dso *self); char dso__symtab_origin(const struct dso *self);
int filename__read_build_id(const char *filename, void *bf, size_t size);
int load_kernel(symbol_filter_t filter); int load_kernel(symbol_filter_t filter);
void symbol__init(unsigned int priv_size); void symbol__init(unsigned int priv_size);