From 0ca693b315aa6893c9d3552fa6a5d536c38b6c4a Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 15 Mar 2018 15:46:22 -0300 Subject: perf annotate: Move 'start' to struct annotation Another field that is not TUI specific. Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Jin Yao Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-jj3dwswndft5mln8hu9k0idv@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate.c | 5 ++--- tools/perf/util/annotate.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 50f8e67..7ec441f 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -35,7 +35,6 @@ struct annotate_browser { struct rb_node *curr_hot; struct annotation_line *selection; struct arch *arch; - u64 start; int nr_asm_entries; int nr_entries; bool searching_backwards; @@ -208,7 +207,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int int color = -1; if (!notes->options->use_offset) - addr += ab->start; + addr += notes->start; if (!notes->options->use_offset) { printed = scnprintf(bf, sizeof(bf), "%" PRIx64 ": ", addr); @@ -991,7 +990,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, ui_helpline__push("Press ESC to exit"); - browser.start = map__rip_2objdump(map, sym->start); + notes->start = map__rip_2objdump(map, sym->start); list_for_each_entry(al, ¬es->src->source, node) { size_t line_len = strlen(al->line); diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 2018a47..0424c12 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -169,6 +169,7 @@ struct annotated_source { struct annotation { pthread_mutex_t lock; u64 max_coverage; + u64 start; struct annotation_options *options; struct annotation_line **offsets; int nr_events; -- cgit v1.1