perf annotate: Add evsel into struct annotation_line_args
Add evsel into struct annotate_args to reduce the number of arguments
that need to travel all the way to line allocation.
This change also allow us to move the arch name initialization under
symbol__annotate function.
Link: http://lkml.kernel.org/n/tip-a9ok53rrgt1s5e8uglyvy6qt@git.kernel.org
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-11-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 681c9c4..75f54eab 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -882,6 +882,7 @@ struct annotate_args {
size_t privsize;
struct arch *arch;
struct map *map;
+ struct perf_evsel *evsel;
s64 offset;
char *line;
int line_nr;
@@ -1570,16 +1571,21 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
}
int symbol__annotate(struct symbol *sym, struct map *map,
- const char *arch_name, size_t privsize,
+ struct perf_evsel *evsel, size_t privsize,
struct arch **parch, char *cpuid)
{
struct annotate_args args = {
.privsize = privsize,
.map = map,
+ .evsel = evsel,
};
+ const char *arch_name = NULL;
struct arch *arch;
int err;
+ if (evsel)
+ arch_name = perf_evsel__env_arch(evsel);
+
arch_name = annotate__norm_arch(arch_name);
if (!arch_name)
return -1;
@@ -1975,8 +1981,7 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
struct rb_root source_line = RB_ROOT;
u64 len;
- if (symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
- 0, NULL, NULL) < 0)
+ if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0)
return -1;
len = symbol__size(sym);