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

Commit 2960ed6f authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix alignment on some sort keys 



The srcline, srcfile and trace sort keys can have long entries.  With
commit 89fee709 ("perf hists: Do column alignment on the format
iterator"), it now aligns output with hist_entry__snprintf_alignment().
So each (possibly long) sort entries don't need to do it themselves.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1456101153-14519-1-git-send-email-namhyung@kernel.org


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

tools/perf/util/sort.c

+4 −4
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *he, char *bf, 
	if (!he->srcline)

		he->srcline = hist_entry__get_srcline(he);



	return repsep_snprintf(bf, size, "%-*.*s", width, width, he->srcline);

	return repsep_snprintf(bf, size, "%-.*s", width, he->srcline);

}



struct sort_entry sort_srcline = {
@@ -366,7 +366,7 @@ static int hist_entry__srcfile_snprintf(struct hist_entry *he, char *bf, 
	if (!he->srcfile)

		he->srcfile = hist_entry__get_srcfile(he);



	return repsep_snprintf(bf, size, "%-*.*s", width, width, he->srcfile);

	return repsep_snprintf(bf, size, "%-.*s", width, he->srcfile);

}



struct sort_entry sort_srcfile = {
@@ -496,11 +496,11 @@ static int hist_entry__trace_snprintf(struct hist_entry *he, char *bf, 


	evsel = hists_to_evsel(he->hists);

	if (evsel->attr.type != PERF_TYPE_TRACEPOINT)

		return scnprintf(bf, size, "%-*.*s", width, width, "N/A");

		return scnprintf(bf, size, "%-.*s", width, "N/A");



	if (he->trace_output == NULL)

		he->trace_output = get_trace_output(he);

	return repsep_snprintf(bf, size, "%-*.*s", width, width, he->trace_output);

	return repsep_snprintf(bf, size, "%-.*s", width, he->trace_output);

}



struct sort_entry sort_trace = {