Re: [PATCH 61/61] perf tools: Fix width computation for srcline sort entry

From: Arnaldo Carvalho de Melo
Date: Mon Sep 19 2016 - 10:33:28 EST


Em Mon, Sep 19, 2016 at 03:10:10PM +0200, Jiri Olsa escreveu:
> Adding header size to width computation for srcline sort entry,
> because it's possible to get empty data with ':0' which set width
> of 2 which is lower than width needed to display column header.

Thanks, cherry-picked, looking at the larger patchset.

- Arnaldo

> Link: http://lkml.kernel.org/n/tip-twbp391v8v9f5idp584hlfov@xxxxxxxxxxxxxx
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
> tools/perf/util/hist.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index 020efa9d3d74..e1be4132054d 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -177,8 +177,10 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
> hists__new_col_len(hists, HISTC_LOCAL_WEIGHT, 12);
> hists__new_col_len(hists, HISTC_GLOBAL_WEIGHT, 12);
>
> - if (h->srcline)
> - hists__new_col_len(hists, HISTC_SRCLINE, strlen(h->srcline));
> + if (h->srcline) {
> + len = MAX(strlen(h->srcline), strlen(sort_srcline.se_header));
> + hists__new_col_len(hists, HISTC_SRCLINE, len);
> + }
>
> if (h->srcfile)
> hists__new_col_len(hists, HISTC_SRCFILE, strlen(h->srcfile));
> --
> 2.7.4