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

olsajiri · acmel · commit 05d3f1a1d5a3 · 2017-11-17T12:16:26.000-03:00
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>
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
@@ -1126,6 +1126,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
 		goto out_free_offsets;
 	}
 
+	symbol__calc_percent(sym, evsel);
+
 	ui_helpline__push("Press ESC to exit");
 
 	notes = symbol__annotation(sym);
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
@@ -177,6 +177,8 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
 		return -1;
 	}
 
+	symbol__calc_percent(sym, evsel);
+
 	if (perf_gtk__is_active_context(pgctx)) {
 		window = pgctx->main_window;
 		notebook = pgctx->notebook;
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
@@ -1653,12 +1653,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
 		}
 	}
 
-	err = symbol__disassemble(sym, &args);
-	if (!err)
-		symbol__calc_percent(sym, evsel);
-
-	return err;
-
+	return symbol__disassemble(sym, &args);
 }
 
 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)
 		return -1;
 
+	symbol__calc_percent(sym, evsel);
+
 	if (print_lines) {
 		srcline_full_filename = full_paths;
 		symbol__calc_lines(sym, map, &source_line);

Original file line number	Diff line number	Diff line change
`@@ -1126,6 +1126,8 @@ int symbol__tui_annotate(struct symbol sym, struct map map,`
`1126`	`1126`	`goto out_free_offsets;`
`1127`	`1127`	`}`
`1128`	`1128`
	`1129`	`+ symbol__calc_percent(sym, evsel);`
	`1130`	`+`
`1129`	`1131`	`ui_helpline__push("Press ESC to exit");`
`1130`	`1132`
`1131`	`1133`	`notes = symbol__annotation(sym);`
Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,8 @@ static int symbol__gtk_annotate(struct symbol sym, struct map map,`
`177`	`177`	`return -1;`
`178`	`178`	`}`
`179`	`179`
	`180`	`+ symbol__calc_percent(sym, evsel);`
	`181`	`+`
`180`	`182`	`if (perf_gtk__is_active_context(pgctx)) {`
`181`	`183`	`window = pgctx->main_window;`
`182`	`184`	`notebook = pgctx->notebook;`
Original file line number	Diff line number	Diff line change
`@@ -1653,12 +1653,7 @@ int symbol__annotate(struct symbol sym, struct map map,`
`1653`	`1653`	`}`
`1654`	`1654`	`}`
`1655`	`1655`
`1656`		`- err = symbol__disassemble(sym, &args);`
`1657`		`- if (!err)`
`1658`		`- symbol__calc_percent(sym, evsel);`
`1659`		`-`
`1660`		`- return err;`
`1661`		`-`
	`1656`	`+ return symbol__disassemble(sym, &args);`
`1662`	`1657`	`}`
`1663`	`1658`
`1664`	`1659`	`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,`
`2005`	`2000`	`if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0)`
`2006`	`2001`	`return -1;`
`2007`	`2002`
	`2003`	`+ symbol__calc_percent(sym, evsel);`
	`2004`	`+`
`2008`	`2005`	`if (print_lines) {`
`2009`	`2006`	`srcline_full_filename = full_paths;`
`2010`	`2007`	`symbol__calc_lines(sym, map, &source_line);`