leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf annotate: Add symbol__annotate function

Browse Source 
Add symbol__annotate function to have generic annotation function to be
called for all annotation sources.

It calls the generic annotation init and then the specific annotation
data retrieval function.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20171011150158.11895-6-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-10-11 17:01:28 +02:00 committed by Arnaldo Carvalho de Melo
parent 37236d5e0b
commit c34df25b40
5 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-top.c
View File

@ -134,7 +134,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
return err; return err;
} }
err = symbol__disassemble(sym, map, NULL, 0, NULL, NULL); err = symbol__annotate(sym, map, NULL, 0, NULL, NULL);
if (err == 0) { if (err == 0) {
out_assign: out_assign:
top->sym_filter_entry = he; top->sym_filter_entry = he;

2
tools/perf/ui/browsers/annotate.c
View File

@ -1120,7 +1120,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
(nr_pcnt - 1); (nr_pcnt - 1);
} }
err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), err = symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
sizeof_bdl, &browser.arch, sizeof_bdl, &browser.arch,
perf_evsel__env_cpuid(evsel)); perf_evsel__env_cpuid(evsel));
if (err) { if (err) {

2
tools/perf/ui/gtk/annotate.c
View File

@ -169,7 +169,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
if (map->dso->annotate_warned) if (map->dso->annotate_warned)
return -1; return -1;
err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), err = symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
0, NULL, NULL); 0, NULL, NULL);
if (err) { if (err) {
char msg[BUFSIZ]; char msg[BUFSIZ];

56
tools/perf/util/annotate.c
View File

@ -1425,13 +1425,11 @@ static const char *annotate__norm_arch(const char *arch_name)
return normalize_arch((char *)arch_name); return normalize_arch((char *)arch_name);
} }
int symbol__disassemble(struct symbol *sym, struct map *map, static int symbol__disassemble(struct symbol *sym, struct map *map,
const char *arch_name, size_t privsize, size_t privsize, struct arch *arch)
struct arch **parch, char *cpuid)
{ {
struct dso *dso = map->dso; struct dso *dso = map->dso;
char command[PATH_MAX * 2]; char command[PATH_MAX * 2];
struct arch *arch = NULL;
FILE *file; FILE *file;
char symfs_filename[PATH_MAX]; char symfs_filename[PATH_MAX];
struct kcore_extract kce; struct kcore_extract kce;
@ -1445,25 +1443,6 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
if (err) if (err)
return err; return err;
arch_name = annotate__norm_arch(arch_name);
if (!arch_name)
return -1;
arch = arch__find(arch_name);
if (arch == NULL)
return -ENOTSUP;
if (parch)
*parch = arch;
if (arch->init) {
err = arch->init(arch, cpuid);
if (err) {
pr_err("%s: failed to initialize %s arch priv area\n", __func__, arch->name);
return err;
}
}
pr_debug("%s: filename=%s, sym=%s, start=%#" PRIx64 ", end=%#" PRIx64 "\n", __func__, pr_debug("%s: filename=%s, sym=%s, start=%#" PRIx64 ", end=%#" PRIx64 "\n", __func__,
symfs_filename, sym->name, map->unmap_ip(map, sym->start), symfs_filename, sym->name, map->unmap_ip(map, sym->start),
map->unmap_ip(map, sym->end)); map->unmap_ip(map, sym->end));
@ -1581,6 +1560,35 @@ out_close_stdout:
goto out_remove_tmp; goto out_remove_tmp;
} }
int symbol__annotate(struct symbol *sym, struct map *map,
const char *arch_name, size_t privsize,
struct arch **parch, char *cpuid)
{
struct arch *arch;
int err;
arch_name = annotate__norm_arch(arch_name);
if (!arch_name)
return -1;
arch = arch__find(arch_name);
if (arch == NULL)
return -ENOTSUP;
if (parch)
*parch = arch;
if (arch->init) {
err = arch->init(arch, cpuid);
if (err) {
pr_err("%s: failed to initialize %s arch priv area\n", __func__, arch->name);
return err;
}
}
return symbol__disassemble(sym, map, privsize, arch);
}
static void insert_source_line(struct rb_root *root, struct source_line *src_line) static void insert_source_line(struct rb_root *root, struct source_line *src_line)
{ {
struct source_line *iter; struct source_line *iter;
@ -1954,7 +1962,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
struct rb_root source_line = RB_ROOT; struct rb_root source_line = RB_ROOT;
u64 len; u64 len;
if (symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), if (symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
0, NULL, NULL) < 0) 0, NULL, NULL) < 0)
return -1; return -1;

2
tools/perf/util/annotate.h
View File

@ -173,7 +173,7 @@ int hist_entry__inc_addr_samples(struct hist_entry *he, struct perf_sample *samp
int symbol__alloc_hist(struct symbol *sym); int symbol__alloc_hist(struct symbol *sym);
void symbol__annotate_zero_histograms(struct symbol *sym); void symbol__annotate_zero_histograms(struct symbol *sym);
int symbol__disassemble(struct symbol *sym, struct map *map, int symbol__annotate(struct symbol *sym, struct map *map,
const char *arch_name, size_t privsize, const char *arch_name, size_t privsize,
struct arch **parch, char *cpuid); struct arch **parch, char *cpuid);