Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf tools: Move symbol__calc_percent() call to outside symbol__disassemble()

Browse Source 
We need to call symbol__calc_percent() periodicaly for top, so it's no
longer convenient to keep it in symbol__disassemble().

Let's separate the symbol__disassemble() to allocate and init
the symbol annotation structs and symbol__calc_percent() to
compute the lines percentages based on symbol hists data.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-gtnp8t4tb00q6lag07psn5nq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2017-11-15 12:20:08 +01:00 committed by Arnaldo Carvalho de Melo
parent 9e4e0a9d2e
commit 05d3f1a1d5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/ui/browsers/annotate.c
View File

@ -1126,6 +1126,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
goto out_free_offsets; goto out_free_offsets;
} }
symbol__calc_percent(sym, evsel);
ui_helpline__push("Press ESC to exit"); ui_helpline__push("Press ESC to exit");
notes = symbol__annotation(sym); notes = symbol__annotation(sym);

2
tools/perf/ui/gtk/annotate.c
View File

@ -177,6 +177,8 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
return -1; return -1;
} }
symbol__calc_percent(sym, evsel);
if (perf_gtk__is_active_context(pgctx)) { if (perf_gtk__is_active_context(pgctx)) {
window = pgctx->main_window; window = pgctx->main_window;
notebook = pgctx->notebook; notebook = pgctx->notebook;

9
tools/perf/util/annotate.c
View File

@ -1653,12 +1653,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
} }
} }
err = symbol__disassemble(sym, &args); return symbol__disassemble(sym, &args);
if (!err)
symbol__calc_percent(sym, evsel);
return err;
} }
static void insert_source_line(struct rb_root *root, struct annotation_line *al) static void insert_source_line(struct rb_root *root, struct annotation_line *al)
@ -2005,6 +2000,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0) if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0)
return -1; return -1;
symbol__calc_percent(sym, evsel);
if (print_lines) { if (print_lines) {
srcline_full_filename = full_paths; srcline_full_filename = full_paths;
symbol__calc_lines(sym, map, &source_line); symbol__calc_lines(sym, map, &source_line);