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

Commit 0c0af78d authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix column width setting on 'trace' sort key 



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: 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 <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1456064558-13086-5-git-send-email-namhyung@kernel.org


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

tools/perf/util/hist.c

+3 −0
Original line number Diff line number Diff line
@@ -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)

tools/perf/util/sort.c

+0 −3
Original line number Diff line number Diff line
@@ -483,9 +483,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);

}