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/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d77994c..3b72519 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -1120,7 +1120,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
                  (nr_pcnt - 1);
        }
 
-       err = symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
+       err = symbol__annotate(sym, map, evsel,
                               sizeof_bdl, &browser.arch,
                               perf_evsel__env_cpuid(evsel));
        if (err) {

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index b498f1a..5e0a56d 100644 (file)
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -169,8 +169,7 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
        if (map->dso->annotate_warned)
                return -1;
 
-       err = symbol__annotate(sym, map, perf_evsel__env_arch(evsel),
-                              0, NULL, NULL);
+       err = symbol__annotate(sym, map, evsel, 0, NULL, NULL);
        if (err) {
                char msg[BUFSIZ];
                symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 681c9c4..75f54ea 100644 (file)
--- 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 @@ out_close_stdout:
 }
 
 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);

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index e577f9d..baf3403 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -174,7 +174,7 @@ int symbol__alloc_hist(struct symbol *sym);
 void symbol__annotate_zero_histograms(struct symbol *sym);
 
 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);
 
 enum symbol_disassemble_errno {