Re: [PATCH v2 1/4] perf annotate stdio: Support --show-nr-samples option

[Taeung Song]

Hi Arnaldo,

On 08/18/2017 12:16 AM, Arnaldo Carvalho de Melo wrote:
> Em Tue, Aug 15, 2017 at 05:06:31PM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Wed, Aug 16, 2017 at 12:13:09AM +0900, Taeung Song escreveu:
> > > Add --show-nr-samples option to perf-annotate
> > > so that it corresponds with perf-report.
> >
> > I'll fold the second patch (2/4) with this one, thanks.
>
> So, I was going to do that, please do it since there is another thing
> missing here, document the new option in
> tools/perf/Documentation/perf-annotate.txt.
>
> - Arnaldo
>   

Yep, got it, will add the new option --show-nr-samples
into Documentation/perf-annotate.txt

Thanks,
Taeung

> > - Arnaldo
> >   
> > > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > > Cc: Milian Wolff <milian.wolff@xxxxxxxx>
> > > Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> > > Signed-off-by: Taeung Song <treeze.taeung@xxxxxxxxx>
> > > ---
> > >   tools/perf/builtin-annotate.c | 2 ++
> > >   tools/perf/util/annotate.c    | 6 +++++-
> > >   2 files changed, 7 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
> > > index 658c920..acde4cc 100644
> > > --- a/tools/perf/builtin-annotate.c
> > > +++ b/tools/perf/builtin-annotate.c
> > > @@ -445,6 +445,8 @@ int cmd_annotate(int argc, const char **argv)
> > >   		    "Show event group information together"),
> > >   	OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
> > >   		    "Show a column with the sum of periods"),
> > > +	OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
> > > +		    "Show a column with the number of samples"),
> > >   	OPT_CALLBACK_DEFAULT(0, "stdio-color", NULL, "mode",
> > >   			     "'always' (default), 'never' or 'auto' only applicable to --stdio mode",
> > >   			     stdio__config_color, "always"),
> > > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> > > index 2dab0e5..4397a8b 100644
> > > --- a/tools/perf/util/annotate.c
> > > +++ b/tools/perf/util/annotate.c
> > > @@ -1145,6 +1145,9 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
> > >   			if (symbol_conf.show_total_period)
> > >   				color_fprintf(stdout, color, " %11" PRIu64,
> > >   					      sample.period);
> > > +			else if (symbol_conf.show_nr_samples)
> > > +				color_fprintf(stdout, color, " %7" PRIu64,
> > > +					      sample.nr_samples);
> > >   			else
> > >   				color_fprintf(stdout, color, " %7.2f", percent);
> > >   		}
> > > @@ -1825,7 +1828,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,
> > >   		width *= evsel->nr_members;
> > >   
> > >   	graph_dotted_len = printf(" %-*.*s|	Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n",
> > > -				  width, width, symbol_conf.show_total_period ? "Event count" : "Percent",
> > > +				  width, width, symbol_conf.show_total_period ? "Period" :
> > > +				  symbol_conf.show_nr_samples ? "Samples" : "Percent",
> > >   				  d_filename, evsel_name, h->nr_samples);
> > >   
> > >   	printf("%-*.*s----\n",
> > > --
> > > 2.7.4