perf tools: Change (symbol|annotation)__calc_percent return type to void

olsajiri · acmel · commit 9e4e0a9d2ef3 · 2017-11-17T12:16:25.000-03:00
There's no need for symbol__calc_percent and annotation__calc_percent functions to return any value, since it's always zero. Changing both function to return void. 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-z0gs28hh24m4gia1t1ctraye@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
@@ -1584,8 +1584,8 @@ static void calc_percent(struct sym_hist *hist,
 	}
 }
 
-static int annotation__calc_percent(struct annotation *notes,
-				    struct perf_evsel *evsel, s64 len)
+static void annotation__calc_percent(struct annotation *notes,
+				     struct perf_evsel *evsel, s64 len)
 {
 	struct annotation_line *al, *next;
 
@@ -1609,15 +1609,13 @@ static int annotation__calc_percent(struct annotation *notes,
 			calc_percent(hist, sample, al->offset, end);
 		}
 	}
-
-	return 0;
 }
 
-int symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel)
+void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel)
 {
 	struct annotation *notes = symbol__annotation(sym);
 
-	return annotation__calc_percent(notes, evsel, symbol__size(sym));
+	annotation__calc_percent(notes, evsel, symbol__size(sym));
 }
 
 int symbol__annotate(struct symbol *sym, struct map *map,
@@ -1656,10 +1654,11 @@ int symbol__annotate(struct symbol *sym, struct map *map,
 	}
 
 	err = symbol__disassemble(sym, &args);
-	if (err)
-		return err;
+	if (!err)
+		symbol__calc_percent(sym, evsel);
+
+	return err;
 
-	return symbol__calc_percent(sym, evsel);
 }
 
 static void insert_source_line(struct rb_root *root, struct annotation_line *al)
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
@@ -107,7 +107,7 @@ struct annotation_line *
 annotation_line__next(struct annotation_line *pos, struct list_head *head);
 int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw);
 size_t disasm__fprintf(struct list_head *head, FILE *fp);
-int symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);
+void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);
 
 struct sym_hist {
 	u64		      nr_samples;

Original file line number	Diff line number	Diff line change
`@@ -1584,8 +1584,8 @@ static void calc_percent(struct sym_hist *hist,`
`1584`	`1584`	`}`
`1585`	`1585`	`}`
`1586`	`1586`
`1587`		`-static int annotation__calc_percent(struct annotation *notes,`
`1588`		`- struct perf_evsel *evsel, s64 len)`
	`1587`	`+static void annotation__calc_percent(struct annotation *notes,`
	`1588`	`+ struct perf_evsel *evsel, s64 len)`
`1589`	`1589`	`{`
`1590`	`1590`	`struct annotation_line al, next;`
`1591`	`1591`
`@@ -1609,15 +1609,13 @@ static int annotation__calc_percent(struct annotation *notes,`
`1609`	`1609`	`calc_percent(hist, sample, al->offset, end);`
`1610`	`1610`	`}`
`1611`	`1611`	`}`
`1612`		`-`
`1613`		`- return 0;`
`1614`	`1612`	`}`
`1615`	`1613`
`1616`		`-int symbol__calc_percent(struct symbol sym, struct perf_evsel evsel)`
	`1614`	`+void symbol__calc_percent(struct symbol sym, struct perf_evsel evsel)`
`1617`	`1615`	`{`
`1618`	`1616`	`struct annotation *notes = symbol__annotation(sym);`
`1619`	`1617`
`1620`		`- return annotation__calc_percent(notes, evsel, symbol__size(sym));`
	`1618`	`+ annotation__calc_percent(notes, evsel, symbol__size(sym));`
`1621`	`1619`	`}`
`1622`	`1620`
`1623`	`1621`	`int symbol__annotate(struct symbol sym, struct map map,`
`@@ -1656,10 +1654,11 @@ int symbol__annotate(struct symbol sym, struct map map,`
`1656`	`1654`	`}`
`1657`	`1655`
`1658`	`1656`	`err = symbol__disassemble(sym, &args);`
`1659`		`- if (err)`
`1660`		`- return err;`
	`1657`	`+ if (!err)`
	`1658`	`+ symbol__calc_percent(sym, evsel);`
	`1659`	`+`
	`1660`	`+ return err;`
`1661`	`1661`
`1662`		`- return symbol__calc_percent(sym, evsel);`
`1663`	`1662`	`}`
`1664`	`1663`
`1665`	`1664`	`static void insert_source_line(struct rb_root root, struct annotation_line al)`