Em Mon, Mar 27, 2017 at 04:10:38PM +0900, Taeung Song escreveu:
> If running 'perf annotate --stdio -l --show-total-period',
> you can see a problem showing only zero '0' for number of samples.
>
> Before:
> $ perf annotate --stdio -l --show-total-period
> ...
> 0 : 400816: push %rbp
> 0 : 400817: mov %rsp,%rbp
> 0 : 40081a: mov %edi,-0x24(%rbp)
> 0 : 40081d: mov %rsi,-0x30(%rbp)
> 0 : 400821: mov -0x24(%rbp),%eax
> 0 : 400824: mov -0x30(%rbp),%rdx
> 0 : 400828: mov (%rdx),%esi
> 0 : 40082a: mov $0x0,%edx
> ...
>
> The reason is number of samples aren't set
> in symbol__get_source_line(). so set it ordinarily.
Can you please take a look at:
0c4a5bcea460 ("perf annotate: Display total number of samples with
--show-total-period")
that introduced the --show-total-period code and take it into account in
this fix?
I.e. from a quick look it did the calculation setting that field in the
TUI code, where it should have done in the util/annotate.c file, so that
all UIs would be able to use it.
After your analysis, please add a Fixes: that cset, ok?
I applied the other two patches and added Martin to the CC list, as he
is the author of that patch and may have something to say here.
- Arnaldo
> After:
> $ perf annotate --stdio -l --show-total-period
> ...
> 3 : 400816: push %rbp
> 4 : 400817: mov %rsp,%rbp
> 0 : 40081a: mov %edi,-0x24(%rbp)
> 0 : 40081d: mov %rsi,-0x30(%rbp)
> 1 : 400821: mov -0x24(%rbp),%eax
> 2 : 400824: mov -0x30(%rbp),%rdx
> 0 : 400828: mov (%rdx),%esi
> 1 : 40082a: mov $0x0,%edx
> ...
>
> Cc: Namhyung Kim <namhy...@kernel.org>
> Cc: Jiri Olsa <jo...@redhat.com>
> Signed-off-by: Taeung Song <treeze.tae...@gmail.com>
> ---
> tools/perf/util/annotate.c | 6 ++++--
> tools/perf/util/annotate.h | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 11af5f0..a37032b 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1665,7 +1665,7 @@ static int symbol__get_source_line(struct symbol *sym,
> struct map *map,
> start = map__rip_2objdump(map, sym->start);
>
> for (i = 0; i < len; i++) {
> - u64 offset;
> + u64 offset, nr_samples;
> double percent_max = 0.0;
>
> src_line->nr_pcnt = nr_pcnt;
> @@ -1674,12 +1674,14 @@ static int symbol__get_source_line(struct symbol
> *sym, struct map *map,
> double percent = 0.0;
>
> h = annotation__histogram(notes, evidx + k);
> + nr_samples = h->addr[i];
> if (h->sum)
> - percent = 100.0 * h->addr[i] / h->sum;
> + percent = 100.0 * nr_samples / h->sum;
>
> if (percent > percent_max)
> percent_max = percent;
> src_line->samples[k].percent = percent;
> + src_line->samples[k].nr = nr_samples;
> }
>
> if (percent_max <= 0.5)
> diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
> index 09776b5..948aa8e 100644
> --- a/tools/perf/util/annotate.h
> +++ b/tools/perf/util/annotate.h
> @@ -98,7 +98,7 @@ struct cyc_hist {
> struct source_line_samples {
> double percent;
> double percent_sum;
> - double nr;
> + u64 nr;
> };
>
> struct source_line {
> --
> 2.7.4
