perf annotate: Remove remaining usages of local annotation options

So that it can get rid of the unused data.

Reviewed-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20231128175441.721579-8-namhyung@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 fda17c1f20319b90192a741ba5fa19e8fb1c840f..cb2eb6dcb5321065e15dfeb60c785ab042c85908 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -37,11 +37,10 @@ static inline struct annotation *browser__annotation(struct ui_browser *browser)
        return symbol__annotation(ms->sym);
 }
 
-static bool disasm_line__filter(struct ui_browser *browser, void *entry)
+static bool disasm_line__filter(struct ui_browser *browser __maybe_unused, void *entry)
 {
-       struct annotation *notes = browser__annotation(browser);
        struct annotation_line *al = list_entry(entry, struct annotation_line, node);
-       return annotation_line__filter(al, notes);
+       return annotation_line__filter(al);
 }
 
 static int ui_browser__jumps_percent_color(struct ui_browser *browser, int nr, bool current)
@@ -269,7 +268,6 @@ static void disasm_rb_tree__insert(struct annotate_browser *browser,
 static void annotate_browser__set_top(struct annotate_browser *browser,
                                      struct annotation_line *pos, u32 idx)
 {
-       struct annotation *notes = browser__annotation(&browser->b);
        unsigned back;
 
        ui_browser__refresh_dimensions(&browser->b);
@@ -279,7 +277,7 @@ static void annotate_browser__set_top(struct annotate_browser *browser,
        while (browser->b.top_idx != 0 && back != 0) {
                pos = list_entry(pos->node.prev, struct annotation_line, node);
 
-               if (annotation_line__filter(pos, notes))
+               if (annotation_line__filter(pos))
                        continue;
 
                --browser->b.top_idx;
@@ -498,7 +496,7 @@ struct disasm_line *annotate_browser__find_offset(struct annotate_browser *brows
        list_for_each_entry(pos, &notes->src->source, al.node) {
                if (pos->al.offset == offset)
                        return pos;
-               if (!annotation_line__filter(&pos->al, notes))
+               if (!annotation_line__filter(&pos->al))
                        ++*idx;
        }
 
@@ -542,7 +540,7 @@ struct annotation_line *annotate_browser__find_string(struct annotate_browser *b
 
        *idx = browser->b.index;
        list_for_each_entry_continue(al, &notes->src->source, node) {
-               if (annotation_line__filter(al, notes))
+               if (annotation_line__filter(al))
                        continue;
 
                ++*idx;
@@ -579,7 +577,7 @@ struct annotation_line *annotate_browser__find_string_reverse(struct annotate_br
 
        *idx = browser->b.index;
        list_for_each_entry_continue_reverse(al, &notes->src->source, node) {
-               if (annotation_line__filter(al, notes))
+               if (annotation_line__filter(al))
                        continue;
 
                --*idx;

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 626ff3baeb85570facc935c9115171279cd16030..09c399ab03843b6fc28228cc15bad044f47e4f75 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -2727,7 +2727,7 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp)
        struct annotation_line *al;
 
        list_for_each_entry(al, &notes->src->source, node) {
-               if (annotation_line__filter(al, notes))
+               if (annotation_line__filter(al))
                        continue;
                annotation_line__write(al, notes, &wops);
                fputc('\n', fp);

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 4283eb4522b28a9d9d956f0a422fe9a4b2e66f3a..6d5a6bb49a9759171e136e30c1008a4c7e01a4ad 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -320,7 +320,7 @@ bool annotation__trylock(struct annotation *notes) EXCLUSIVE_TRYLOCK_FUNCTION(tr
 
 static inline int annotation__cycles_width(struct annotation *notes)
 {
-       if (notes->branch && notes->options->show_minmax_cycle)
+       if (notes->branch && annotate_opts.show_minmax_cycle)
                return ANNOTATION__IPC_WIDTH + ANNOTATION__MINMAX_CYCLES_WIDTH;
 
        return notes->branch ? ANNOTATION__IPC_WIDTH + ANNOTATION__CYCLES_WIDTH : 0;
@@ -331,9 +331,9 @@ static inline int annotation__pcnt_width(struct annotation *notes)
        return (symbol_conf.show_total_period ? 12 : 7) * notes->nr_events;
 }
 
-static inline bool annotation_line__filter(struct annotation_line *al, struct annotation *notes)
+static inline bool annotation_line__filter(struct annotation_line *al)
 {
-       return notes->options->hide_src_code && al->offset == -1;
+       return annotate_opts.hide_src_code && al->offset == -1;
 }
 
 void annotation__set_offsets(struct annotation *notes, s64 size);