Skip to content

Commit

Permalink
perf symbols: Introduce ELF counterparts to symbol_type__is_a
Browse files Browse the repository at this point in the history
For selecting the right types of symbols in ELF symtabs.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260550239-5372-3-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Dec 12, 2009
1 parent 6893d4e commit d45868d
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,26 @@ static int dso__synthesize_plt_symbols(struct dso *self, struct map *map,
return 0;
}

static bool elf_sym__is_a(GElf_Sym *self, enum map_type type)
{
switch (type) {
case MAP__FUNCTION:
return elf_sym__is_function(self);
default:
return false;
}
}

static bool elf_sec__is_a(GElf_Shdr *self, Elf_Data *secstrs, enum map_type type)
{
switch (type) {
case MAP__FUNCTION:
return elf_sec__is_text(self, secstrs);
default:
return false;
}
}

static int dso__load_sym(struct dso *self, struct map *map,
struct map_groups *mg, const char *name, int fd,
symbol_filter_t filter, int kernel, int kmodule)
Expand Down Expand Up @@ -825,7 +845,7 @@ static int dso__load_sym(struct dso *self, struct map *map,
int is_label = elf_sym__is_label(&sym);
const char *section_name;

if (!is_label && !elf_sym__is_function(&sym))
if (!is_label && !elf_sym__is_a(&sym, map->type))
continue;

sec = elf_getscn(elf, sym.st_shndx);
Expand All @@ -834,7 +854,7 @@ static int dso__load_sym(struct dso *self, struct map *map,

gelf_getshdr(sec, &shdr);

if (is_label && !elf_sec__is_text(&shdr, secstrs))
if (is_label && !elf_sec__is_a(&shdr, secstrs, map->type))
continue;

elf_name = elf_sym__name(&sym, symstrs);
Expand Down

0 comments on commit d45868d

Please sign in to comment.