Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a53da05 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-irhzpfmgdaf6cyk0uqqexoh9@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bfa63519

tools/perf/builtin-c2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */