perf annotate: Get rid of offsets array

The struct annotated_source.offsets[] is to save pointers to
annotation_line at each offset.  We can use annotated_source__get_line()
helper instead so let's get rid of the array.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240404175716.1225482-6-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 e72583f37972350fd0e253cbe7736ce0755943ab..c93da2ce727ff7d9f0a5e5c8a17c47687f7fd291 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -977,7 +977,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,
                        dso->annotate_warned = true;
                        symbol__strerror_disassemble(ms, err, msg, sizeof(msg));
                        ui__error("Couldn't annotate %s:\n%s", sym->name, msg);
-                       goto out_free_offsets;
+                       return -1;
                }
        }
 
@@ -996,8 +996,5 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,
        if(not_annotated)
                annotated_source__purge(notes->src);
 
-out_free_offsets:
-       if(not_annotated)
-               zfree(&notes->src->offsets);
        return ret;
 }

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index d98fc248ba5bae186375ceaeef651cd9a9f242a2..0e83198359869b63458f1429a5bdce6aedca5a6e 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1378,7 +1378,7 @@ annotation__mark_jump_targets(struct annotation *notes, struct symbol *sym)
        }
 }
 
-static void annotation__set_offsets(struct annotation *notes, s64 size)
+static void annotation__set_index(struct annotation *notes)
 {
        struct annotation_line *al;
        struct annotated_source *src = notes->src;
@@ -1393,18 +1393,9 @@ static void annotation__set_offsets(struct annotation *notes, s64 size)
                if (src->max_line_len < line_len)
                        src->max_line_len = line_len;
                al->idx = src->nr_entries++;
-               if (al->offset != -1) {
+               if (al->offset != -1)
                        al->idx_asm = src->nr_asm_entries++;
-                       /*
-                        * FIXME: short term bandaid to cope with assembly
-                        * routines that comes with labels in the same column
-                        * as the address in objdump, sigh.
-                        *
-                        * E.g. copy_user_generic_unrolled
-                        */
-                       if (al->offset < size)
-                               notes->src->offsets[al->offset] = al;
-               } else
+               else
                        al->idx_asm = -1;
        }
 }
@@ -1835,25 +1826,21 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
        size_t size = symbol__size(sym);
        int nr_pcnt = 1, err;
 
-       notes->src->offsets = zalloc(size * sizeof(struct annotation_line *));
-       if (notes->src->offsets == NULL)
-               return ENOMEM;
-
        if (evsel__is_group_event(evsel))
                nr_pcnt = evsel->core.nr_members;
 
        err = symbol__annotate(ms, evsel, parch);
        if (err)
-               goto out_free_offsets;
+               return err;
 
        symbol__calc_percent(sym, evsel);
 
-       annotation__set_offsets(notes, size);
+       annotation__set_index(notes);
        annotation__mark_jump_targets(notes, sym);
 
        err = annotation__compute_ipc(notes, size);
        if (err)
-               goto out_free_offsets;
+               return err;
 
        annotation__init_column_widths(notes, sym);
        notes->nr_events = nr_pcnt;
@@ -1862,10 +1849,6 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
        sym->annotate2 = 1;
 
        return 0;
-
-out_free_offsets:
-       zfree(&notes->src->offsets);
-       return err;
 }
 
 static int annotation__config(const char *var, const char *value, void *data)

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index aa3298c2030019e2f95bf589273f167fbd9835d0..d61184499bda0d107c46eb63a98a705d0f43d778 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -246,7 +246,6 @@ struct cyc_hist {
  *               we have more than a group in a evlist, where we will want
  *               to see each group separately, that is why symbol__annotate2()
  *               sets src->nr_histograms to evsel->nr_members.
- * @offsets: Array of annotation_line to be accessed by offset.
  * @samples: Hash map of sym_hist_entry.  Keyed by event index and offset in symbol.
  * @nr_entries: Number of annotated_line in the source list.
  * @nr_asm_entries: Number of annotated_line with actual asm instruction in the
@@ -262,7 +261,6 @@ struct cyc_hist {
 struct annotated_source {
        struct list_head        source;
        struct sym_hist         *histograms;
-       struct annotation_line  **offsets;
        struct hashmap          *samples;
        int                     nr_histograms;
        int                     nr_entries;