Re: [PATCH 4/5] perf report: Fix dynamic entry display in hierarchy

[Arnaldo Carvalho de Melo]

Em Sat, Feb 27, 2016 at 03:52:46AM +0900, Namhyung Kim escreveu:
> When dynamic sort key is used it might not show pretty printed output.
> This is because the trace output was not set only for the first dynamic
> sort key.  During hierarchy_insert_entry() it missed to pass the
> trace_output to dynamic entries.  Also even if it did, only first entry
> will have it.  Subsequent entries might set it during collapsing stage
> but it's not guaranteed.
> 
> Before:
> 
>   $ perf report --hierarchy --stdio -s ptr,bytes_req,gfp_flags -g none
>   #
>   #       Overhead  ptr / bytes_req / gfp_flags
>   # ..............  ..........................................
>   #
>       37.50%        0xffff8803f7669400
>          37.50%        448
>             37.50%        66080
>       10.42%        0xffff8803f766be00
>           8.33%        96
>              8.33%        66080
>           2.08%        512
>              2.08%        67280
> 
> After:
> 
>   #
>   #       Overhead  ptr / bytes_req / gfp_flags
>   # ..............  ..........................................
>   #
>       37.50%        0xffff8803f7669400
>          37.50%        448
>             37.50%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC

So, I'm not getting this translation, it looks just like before. So I
tried the non-hierarchy mode and got this [FAILED TO PARSE] on each
line:

Samples: 107  of event 'kmem:kmalloc', Event count (approx.): 107
Overhead  Trace output 
  33.64%  [FAILED TO PARSE] call_site=0xffffffff811a0747 ptr=0xffff880109c54000 bytes_req=4096 bytes_alloc=4096 gfp_flags=37748928                           â

Investigating...


>       10.42%        0xffff8803f766be00
>           8.33%        96
>              8.33%        GFP_ATOMIC|GFP_NOWARN|GFP_NOMEMALLOC
>           2.08%        512
>              2.08%        GFP_KERNEL|GFP_NOWARN|GFP_REPEAT|GFP
> 
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
>  tools/perf/util/hist.c | 2 +-
>  tools/perf/util/sort.c | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index cc849d326211..9b3f582867d6 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -1125,7 +1125,7 @@ static struct hist_entry *hierarchy_insert_entry(struct hists *hists,
>  	new->fmt = fmt;
>  
>  	/* some fields are now passed to 'new' */
> -	if (perf_hpp__is_trace_entry(fmt))
> +	if (perf_hpp__is_trace_entry(fmt) || perf_hpp__is_dynamic_entry(fmt))
>  		he->trace_output = NULL;
>  	else
>  		new->trace_output = NULL;
> diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
> index e948fcac0939..3b1b4018f111 100644
> --- a/tools/perf/util/sort.c
> +++ b/tools/perf/util/sort.c
> @@ -1767,6 +1767,9 @@ static int __sort__hde_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
>  	if (hde->raw_trace)
>  		goto raw_field;
>  
> +	if (!he->trace_output)
> +		he->trace_output = get_trace_output(he);
> +
>  	field = hde->field;
>  	namelen = strlen(field->name);
>  	str = he->trace_output;
> -- 
> 2.7.1