Commit cb1e8bfc authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf annotate: Set notes->src->nr_events early

We want to use it in different places so make sure it sets properly
in symbol__annotate() before creating the disasm lines.
Signed-off-by: default avatarNamhyung 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/20240803211332.1107222-3-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2dc02c26
...@@ -925,6 +925,11 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel, ...@@ -925,6 +925,11 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,
return -1; return -1;
} }
if (evsel__is_group_event(evsel))
notes->src->nr_events = evsel->core.nr_members;
else
notes->src->nr_events = 1;
if (annotate_opts.full_addr) if (annotate_opts.full_addr)
notes->src->start = map__objdump_2mem(ms->map, ms->sym->start); notes->src->start = map__objdump_2mem(ms->map, ms->sym->start);
else else
...@@ -1842,10 +1847,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel, ...@@ -1842,10 +1847,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
struct symbol *sym = ms->sym; struct symbol *sym = ms->sym;
struct annotation *notes = symbol__annotation(sym); struct annotation *notes = symbol__annotation(sym);
size_t size = symbol__size(sym); size_t size = symbol__size(sym);
int nr_pcnt = 1, err; int err;
if (evsel__is_group_event(evsel))
nr_pcnt = evsel->core.nr_members;
err = symbol__annotate(ms, evsel, parch); err = symbol__annotate(ms, evsel, parch);
if (err) if (err)
...@@ -1861,8 +1863,6 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel, ...@@ -1861,8 +1863,6 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,
return err; return err;
annotation__init_column_widths(notes, sym); annotation__init_column_widths(notes, sym);
notes->src->nr_events = nr_pcnt;
annotation__update_column_widths(notes); annotation__update_column_widths(notes);
sym->annotate2 = 1; sym->annotate2 = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment