redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

perf_counter tools: Optionally pass a symbol filter to the dso load routines

Browse source 
Will be used by perf top.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20090528175526.GF4747@ghostprotocols.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Arnaldo Carvalho de Melo 2009-05-28 14:55:26 -03:00 committed by Ingo Molnar
parent a827c875f2
commit 69ee69f63c
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/perf_counter/builtin-report.c
View file

@ -87,7 +87,7 @@ static struct dso *dsos__findnew(const char *name)
if (!dso)
goto out_delete_dso;
nr = dso__load(dso);
nr = dso__load(dso, NULL);
if (nr < 0) {
fprintf(stderr, "Failed to open: %s\n", name);
goto out_delete_dso;
@ -124,7 +124,7 @@ static int load_kernel(void)
if (!kernel_dso)
return -1;
err = dso__load_kernel(kernel_dso, vmlinux);
err = dso__load_kernel(kernel_dso, vmlinux, NULL);
if (err) {
dso__delete(kernel_dso);
kernel_dso = NULL;

34
Documentation/perf_counter/util/symbol.c
View file

@ -155,7 +155,7 @@ static int hex2long(char *ptr, unsigned long *long_val)
return p - ptr;
}
static int dso__load_kallsyms(struct dso *self)
static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter)
{
struct rb_node *nd, *prevnd;
char *line = NULL;
@ -201,7 +201,10 @@ static int dso__load_kallsyms(struct dso *self)
if (sym == NULL)
goto out_delete_line;
dso__insert_symbol(self, sym);
if (filter && filter(self, sym))
symbol__delete(sym, self->sym_priv_size);
else
dso__insert_symbol(self, sym);
}
/*
@ -286,7 +289,8 @@ static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
return sec;
}
static int dso__load_sym(struct dso *self, int fd, const char *name)
static int dso__load_sym(struct dso *self, int fd, const char *name,
symbol_filter_t filter)
{
Elf_Data *symstrs;
uint32_t nr_syms;
@ -352,9 +356,12 @@ static int dso__load_sym(struct dso *self, int fd, const char *name)
if (!f)
goto out_elf_end;
dso__insert_symbol(self, f);
nr++;
if (filter && filter(self, f))
symbol__delete(f, self->sym_priv_size);
else {
dso__insert_symbol(self, f);
nr++;
}
}
err = nr;
@ -364,7 +371,7 @@ out_close:
return err;
}
int dso__load(struct dso *self)
int dso__load(struct dso *self, symbol_filter_t filter)
{
int size = strlen(self->name) + sizeof("/usr/lib/debug%s.debug");
char *name = malloc(size);
@ -396,7 +403,7 @@ more:
fd = open(name, O_RDONLY);
} while (fd < 0);
ret = dso__load_sym(self, fd, name);
ret = dso__load_sym(self, fd, name, filter);
close(fd);
/*
@ -410,28 +417,29 @@ out:
return ret;
}
static int dso__load_vmlinux(struct dso *self, const char *vmlinux)
static int dso__load_vmlinux(struct dso *self, const char *vmlinux,
symbol_filter_t filter)
{
int err, fd = open(vmlinux, O_RDONLY);
if (fd < 0)
return -1;
err = dso__load_sym(self, fd, vmlinux);
err = dso__load_sym(self, fd, vmlinux, filter);
close(fd);
return err;
}
int dso__load_kernel(struct dso *self, const char *vmlinux)
int dso__load_kernel(struct dso *self, const char *vmlinux, symbol_filter_t filter)
{
int err = -1;
if (vmlinux)
err = dso__load_vmlinux(self, vmlinux);
err = dso__load_vmlinux(self, vmlinux, filter);
if (err)
err = dso__load_kallsyms(self);
err = dso__load_kallsyms(self, filter);
return err;
}

7
Documentation/perf_counter/util/symbol.h
View file

@ -19,6 +19,8 @@ struct dso {
char name[0];
};
typedef int (*symbol_filter_t)(struct dso *self, struct symbol *sym);
struct dso *dso__new(const char *name, unsigned int sym_priv_size);
void dso__delete(struct dso *self);
@ -29,8 +31,9 @@ static inline void *dso__sym_priv(struct dso *self, struct symbol *sym)
struct symbol *dso__find_symbol(struct dso *self, uint64_t ip);
int dso__load_kernel(struct dso *self, const char *vmlinux);
int dso__load(struct dso *self);
int dso__load_kernel(struct dso *self, const char *vmlinux,
symbol_filter_t filter);
int dso__load(struct dso *self, symbol_filter_t filter);
size_t dso__fprintf(struct dso *self, FILE *fp);