|
@@ -2325,7 +2325,7 @@ int symbol__tty_annotate2(struct symbol *sym, struct map *map,
|
|
struct dso *dso = map->dso;
|
|
struct dso *dso = map->dso;
|
|
struct rb_root source_line = RB_ROOT;
|
|
struct rb_root source_line = RB_ROOT;
|
|
struct annotation_options opts = annotation__default_options;
|
|
struct annotation_options opts = annotation__default_options;
|
|
- const char *ev_name = perf_evsel__name(evsel);
|
|
|
|
|
|
+ struct annotation *notes = symbol__annotation(sym);
|
|
char buf[1024];
|
|
char buf[1024];
|
|
|
|
|
|
if (symbol__annotate2(sym, map, evsel, &opts, NULL) < 0)
|
|
if (symbol__annotate2(sym, map, evsel, &opts, NULL) < 0)
|
|
@@ -2337,12 +2337,8 @@ int symbol__tty_annotate2(struct symbol *sym, struct map *map,
|
|
print_summary(&source_line, dso->long_name);
|
|
print_summary(&source_line, dso->long_name);
|
|
}
|
|
}
|
|
|
|
|
|
- if (perf_evsel__is_group_event(evsel)) {
|
|
|
|
- perf_evsel__group_desc(evsel, buf, sizeof(buf));
|
|
|
|
- ev_name = buf;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- fprintf(stdout, "%s() %s\nEvent: %s\n\n", sym->name, dso->long_name, ev_name);
|
|
|
|
|
|
+ annotation__scnprintf_samples_period(notes, buf, sizeof(buf), evsel);
|
|
|
|
+ fprintf(stdout, "%s\n%s() %s\n", buf, sym->name, dso->long_name);
|
|
symbol__annotate_fprintf2(sym, stdout);
|
|
symbol__annotate_fprintf2(sym, stdout);
|
|
|
|
|
|
annotated_source__purge(symbol__annotation(sym)->src);
|
|
annotated_source__purge(symbol__annotation(sym)->src);
|