All of lore.kernel.org
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	David Ahern <dsahern@gmail.com>, Andi Kleen <andi@firstfloor.org>
Subject: [PATCH 5/5] perf tools: Fix column width setting on 'trace' sort key
Date: Sun, 21 Feb 2016 23:22:38 +0900	[thread overview]
Message-ID: <1456064558-13086-5-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1456064558-13086-1-git-send-email-namhyung@kernel.org>

It missed to update column length of the 'trace' sort key in the
hists__calc_col_len() so it might truncate the output.  It calculated
the column length in the ->cmp() callback originally but it doesn't
guarantee it's called always.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/hist.c | 3 +++
 tools/perf/util/sort.c | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 827c6cbcd05d..017eb5c42c37 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -179,6 +179,9 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
 	if (h->transaction)
 		hists__new_col_len(hists, HISTC_TRANSACTION,
 				   hist_entry__transaction_len());
+
+	if (h->trace_output)
+		hists__new_col_len(hists, HISTC_TRACE, strlen(h->trace_output));
 }
 
 void hists__output_recalc_col_len(struct hists *hists, int max_rows)
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 1d2b85c808d0..ea05497cfee9 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -501,9 +501,6 @@ sort__trace_cmp(struct hist_entry *left, struct hist_entry *right)
 	if (right->trace_output == NULL)
 		right->trace_output = get_trace_output(right);
 
-	hists__new_col_len(left->hists, HISTC_TRACE, strlen(left->trace_output));
-	hists__new_col_len(right->hists, HISTC_TRACE, strlen(right->trace_output));
-
 	return strcmp(right->trace_output, left->trace_output);
 }
 
-- 
2.7.1

  parent reply	other threads:[~2016-02-21 18:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-21 14:22 [PATCH 1/5] perf tools: Fix assertion failure on dynamic entry Namhyung Kim
2016-02-21 14:22 ` [PATCH 2/5] perf tools: Fix segfault on dynamic entries Namhyung Kim
2016-02-21 17:37   ` Jiri Olsa
2016-02-25  5:37   ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-02-21 14:22 ` [PATCH 3/5] perf tools: Update srcline/file if needed Namhyung Kim
2016-02-21 17:39   ` Jiri Olsa
2016-02-22  0:31     ` [PATCH v2 " Namhyung Kim
2016-02-22  6:49       ` Jiri Olsa
2016-02-25  5:37       ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-02-21 14:22 ` [PATCH 4/5] perf tools: Fix alignment on some sort keys Namhyung Kim
2016-02-21 17:40   ` Jiri Olsa
2016-02-22  0:32     ` [PATCH v2 " Namhyung Kim
2016-02-25  5:38       ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-02-21 14:22 ` Namhyung Kim [this message]
2016-02-21 17:41   ` [PATCH 5/5] perf tools: Fix column width setting on 'trace' sort key Jiri Olsa
2016-02-25  5:38   ` [tip:perf/core] " tip-bot for Namhyung Kim
2016-02-21 17:37 ` [PATCH 1/5] perf tools: Fix assertion failure on dynamic entry Jiri Olsa
2016-02-22 15:08   ` Arnaldo Carvalho de Melo
2016-02-25  5:38 ` [tip:perf/core] " tip-bot for Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1456064558-13086-5-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=andi@firstfloor.org \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.