system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf annotate: Get rid of offsets array

Browse source 
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>
This commit is contained in:
Namhyung Kim 2024-04-04 10:57:12 -07:00 committed by Arnaldo Carvalho de Melo
parent 0c053ed273
commit cee9b86043
3 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/perf/ui/browsers/annotate.c
View file

@ -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;
}

29
tools/perf/util/annotate.c
View file

@ -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)

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

@ -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;