perf srcline: Make hist_entry srcline helper consistent with map's

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jun 7, 2018 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2018-06-07 08:11 UTC #0 lore raw

Commit-ID:  6a53da05c433284252c9363043bf3d8a5789cfca
Gitweb:     https://git.kernel.org/tip/6a53da05c433284252c9363043bf3d8a5789cfca
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 28 May 2018 11:06:58 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 4 Jun 2018 10:28:53 -0300

perf srcline: Make hist_entry srcline helper consistent with map's

No need to have "get_srcline", plain hist_entry__srcline() is enough and shorter.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-c2c.c | 2 +-
 tools/perf/util/sort.c   | 8 ++++----
 tools/perf/util/sort.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

tools/perf/builtin-c2c.c +1 -1

index 2126bfbcb385..307b3594525f 100644
@@ -1976,7 +1976,7 @@ static int filter_cb(struct hist_entry *he)
 	c2c_he = container_of(he, struct c2c_hist_entry, he);
 
 	if (c2c.show_src && !he->srcline)
-		he->srcline = hist_entry__get_srcline(he);
+		he->srcline = hist_entry__srcline(he);
 
 	calc_width(c2c_he);

tools/perf/util/sort.c +4 -4

index 4ab0b4ab24e4..fed2952ab45a 100644
@@ -331,7 +331,7 @@ struct sort_entry sort_sym = {
 
 /* --sort srcline */
 
-char *hist_entry__get_srcline(struct hist_entry *he)
+char *hist_entry__srcline(struct hist_entry *he)
 {
 	return map__srcline(he->ms.map, he->ip, he->ms.sym);
 }

@@ -340,9 +340,9 @@ static int64_t
 sort__srcline_cmp(struct hist_entry *left, struct hist_entry *right)
 {
 	if (!left->srcline)
-		left->srcline = hist_entry__get_srcline(left);
+		left->srcline = hist_entry__srcline(left);
 	if (!right->srcline)
-		right->srcline = hist_entry__get_srcline(right);
+		right->srcline = hist_entry__srcline(right);
 
 	return strcmp(right->srcline, left->srcline);
 }

@@ -351,7 +351,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *he, char *bf,
 					size_t size, unsigned int width)
 {
 	if (!he->srcline)
-		he->srcline = hist_entry__get_srcline(he);
+		he->srcline = hist_entry__srcline(he);
 
 	return repsep_snprintf(bf, size, "%-.*s", width, he->srcline);
 }

tools/perf/util/sort.h +1 -1

index 9e6896293bbd..f007a26d6f6d 100644
@@ -292,5 +292,5 @@ int64_t
 sort__daddr_cmp(struct hist_entry *left, struct hist_entry *right);
 int64_t
 sort__dcacheline_cmp(struct hist_entry *left, struct hist_entry *right);
-char *hist_entry__get_srcline(struct hist_entry *he);
+char *hist_entry__srcline(struct hist_entry *he);
 #endif	/* __PERF_SORT_H */