[tip:perf/core] perf tools: Fix alignment on some sort keys

From: tip-bot for Namhyung Kim
Date: Thu Feb 25 2016 - 01:31:37 EST

Commit-ID: 2960ed6f8d6794dcb39ba48c3e515e5be18ee9e1
Gitweb: http://git.kernel.org/tip/2960ed6f8d6794dcb39ba48c3e515e5be18ee9e1
Author: Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Mon, 22 Feb 2016 09:32:33 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Mon, 22 Feb 2016 12:05:55 -0300

perf tools: Fix alignment on some sort keys

The srcline, srcfile and trace sort keys can have long entries. With
commit 89fee7094323 ("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: Namhyung Kim <namhyung@xxxxxxxxxx>
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1456101153-14519-1-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
tools/perf/util/sort.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 6f4605b..a7d73e5 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -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 = {