perf annotate: Fix missing number of samples for source_line_samples
PATCH v4 1/1 perf annotate: Fix missing number of samples for source_line_samples
The option 'show-total-period' works fine without a option '-l'. But 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 it was missed to set number of samples of source_line_samples, so set it ordinarily.
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
...--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +4 -2
@@ -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 )
tools/perf/util/annotate.h +1 -1
@@ -98,7 +98,7 @@ struct cyc_hist {struct source_line_samples {double percent;double percent_sum; -double nr; +u64 nr; };struct source_line {
Signature · 1 line
2.7.4
Arnaldo Carvalho de Melo
maintainerEm Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
If you do that at that point, don't you have to change the TUI not to do it again?
- Arnaldo
Quoted 83 lines
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 it was missed to set number of samples of
source_line_samples, so set it ordinarily.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 <[email protected]>Cc Jiri Olsa <[email protected]>Cc Martin Liska <[email protected]>Fixes 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)tools/perf/util/annotate.c +4
-2@@ -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 )tools/perf/util/annotate.h +1
-1@@ -98,7 +98,7 @@ struct cyc_hist {struct source_line_samples {double percent;double percent_sum; -double nr; +u64 nr; };struct source_line {Signature · 1 line
2.7.4
Quoted 10 lines · Arnaldo Carvalho de Melo
Em Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
If you do that at that point, don't you have to change the TUI not to do it again?
- Arnaldo
Yes, there isn't the same problem when using 't' on TUI of 'perf annotate'. (As you know, 't' is show-total-period option)
In 'annotate' TUI, we can use the 't' functionality without the problem. Because of the code (util/annotate.c:911 and ui/browsers/annotate.c:412) as below.
881 double disasm__calc_percent(struct annotation *notes, int evidx,
s64 offset,
882 s64 end, const char **path, u64*nr_samples)
883 {
...
910 if (h->sum) {
911 *nr_samples = hits;
And,
378 static void annotate_browser__calc_percent(struct annotate_browser
*browser,
379 struct perf_evsel *evsel)
380 {
...
407 bpos->samples[i].percent =
disasm__calc_percent(notes,
408 evsel->idx + i, 409 pos->offset, 410 next ?
next->offset : len,
411 &path, &nr_samples);
412 bpos->samples[i].nr = nr_samples;
And 'perf annotate --stdio --show-total-period' hasn't the problem, too. Because of the same code (util/annotate.c:911).
But if with '-l', i.e. 'perf annotate --stdio -l --show-total-period', the problem happen. Because 'nr' of source_line_samples aren't ordinarily set in symbol__get_source_line() (util/annotate.c:1634~..)
,so fix it as this patch
Are there something I missed or misunderstand ?
Thanks,
Taeung
Quoted 83 lines
Quoted 83 lines
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 it was missed to set number of samples of
source_line_samples, so set it ordinarily.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 <[email protected]>Cc Jiri Olsa <[email protected]>Cc Martin Liska <[email protected]>Fixes 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)tools/perf/util/annotate.c +4
-2@@ -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 )tools/perf/util/annotate.h +1
-2@@ -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
Quoted 8 lines · Taeung Song
Quoted 5 lines · Arnaldo Carvalho de Melo
Em Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
Quoted 7 lines
Quoted 5 lines
If you do that at that point, don't you have to change the TUI not to do it again?
- Arnaldo
Yes, there isn't the same problem when using 't' on TUI of 'perf annotate'.
Sorry, missay the reply.
I don't change the TUI to fix same problem of this patch. The reason are like below..
Quoted 135 lines
(As you know, 't' is show-total-period option)
In 'annotate' TUI, we can use the 't' functionality without the problem. Because of the code (
util/annotate.c:911andui/browsers/annotate.c:412) as below.881 double disasm__calc_percent(struct annotation *notes, int evidx,
s64 offset,
882 s64 end, const char **path, u64*nr_samples)
883 {
...
910 if (h->sum) {
911*nr_samples= hits;And,
378 static void annotate_browser__calc_percent(struct
annotate_browser
*browser,
379 structperf_evsel*evsel)
380 {
...
407 bpos->samples[i].percent =
disasm__calc_percent(notes,408 evsel->idx + i, 409 pos->offset, 410 next ? next->offset: len,
411 &path,&nr_samples);
412 bpos->samples[i].nr =nr_samples;And 'perf annotate --stdio --show-total-period' hasn't the problem, too. Because of the same code (
util/annotate.c:911).But if with '-l', i.e. 'perf annotate --stdio -l --show-total-period', the problem happen. Because 'nr' of
source_line_samplesaren't ordinarily set
insymbol__get_source_line()(util/annotate.c:1634~..)
,so fix it as this patchAre there something I missed or misunderstand ?
Thanks,
TaeungQuoted 86 lines
Quoted 86 lines
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 it was missed to set number of samples of
source_line_samples, so set it ordinarily.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 <[email protected]>Cc Jiri Olsa <[email protected]>Cc Martin Liska <[email protected]>Fixes 0c4a5bcea460 ("perf annotate: Display total number of sampleswith --show-total-period")
Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)tools/perf/util/annotate.c +1
-1@@ -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;tools/perf/util/annotate.c +3
-1@@ -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)tools/perf/util/annotate.h +1
-2@@ -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
Arnaldo Carvalho de Melo
maintainerEm Tue, Mar 28, 2017 at 11:21:33PM +0900, Taeung Song escreveu:
Quoted 8 lines · Arnaldo Carvalho de Melo
Quoted 5 lines
Em Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
Quoted 8 lines
Quoted 5 lines
If you do that at that point, don't you have to change the TUI not to do it again?
- Arnaldo
Yes, there isn't the same problem when using 't' on TUI of 'perf annotate'. (As you know, 't' is show-total-period option)
Yeah, there is no problem on the TUI, but since you do it in a function taht the TUI uses, it may not be needed to do this in tools/perf/util/annotate.c _and_ in tools/perf/ui/browsers/annotate.c, right?
- Arnaldo
Quoted 130 lines
In 'annotate' TUI, we can use the 't' functionality without the problem. Because of the code (
util/annotate.c:911andui/browsers/annotate.c:412) as below.881 double disasm__calc_percent(struct annotation *notes, int evidx, s64
offset,
882 s64 end, const char **path, u64*nr_samples)
883 {
...
910 if (h->sum) {
911*nr_samples= hits;And,
378 static void annotate_browser__calc_percent(struct
annotate_browser
*browser,
379 structperf_evsel*evsel)
380 {
...
407 bpos->samples[i].percent =
disasm__calc_percent(notes,408 evsel->idx + i, 409 pos->offset, 410 next ? next->offset :len,
411 &path,&nr_samples);
412 bpos->samples[i].nr =nr_samples;And 'perf annotate --stdio --show-total-period' hasn't the problem, too. Because of the same code (
util/annotate.c:911).But if with '-l', i.e. 'perf annotate --stdio -l --show-total-period', the problem happen. Because 'nr' of
source_line_samplesaren't ordinarily set
insymbol__get_source_line()(util/annotate.c:1634~..)
,so fix it as this patchAre there something I missed or misunderstand ?
Thanks,
TaeungQuoted 83 lines
Quoted 83 lines
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 it was missed to set number of samples of
source_line_samples, so set it ordinarily.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 <[email protected]>Cc Jiri Olsa <[email protected]>Cc Martin Liska <[email protected]>Fixes 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)tools/perf/util/annotate.c +4
-2@@ -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 )tools/perf/util/annotate.h +1
-2@@ -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
Quoted 12 lines · Arnaldo Carvalho de Melo
Em Tue, Mar 28, 2017 at 11:21:33PM +0900, Taeung Song escreveu:
Quoted 11 lines · Arnaldo Carvalho de Melo
Quoted 8 lines
Em Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
If you do that at that point, don't you have to change the TUI not to do it again?
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
- Arnaldo
Yes, there isn't the same problem when using 't' on TUI of 'perf annotate'. (As you know, 't' is show-total-period option)
Yeah, there is no problem on the TUI, but since you do it in a function taht the TUI uses, it may not be needed to do this in
No, TUI don't use the function I modified in this patch at all. (i.e. symbol__get_source_line())
Only symbol__tty_annotate() use symbol__get_source_line().
(As you know, annotate TUI use symbol__tui_annotate() )
Quoted 4 lines
tools/perf/util/annotate.c_and_ intools/perf/ui/browsers/annotate.c, right?- Arnaldo
Are there something I missed or misunderstand ?
Thanks,
Taeung
Quoted 131 lines
Quoted 131 lines
In 'annotate' TUI, we can use the 't' functionality without the problem. Because of the code (
util/annotate.c:911andui/browsers/annotate.c:412) as below.881 double disasm__calc_percent(struct annotation *notes, int evidx, s64
offset,
882 s64 end, const char **path, u64*nr_samples)
883 {
...
910 if (h->sum) {
911*nr_samples= hits;And,
378 static void annotate_browser__calc_percent(struct
annotate_browser
*browser,
379 structperf_evsel*evsel)
380 {
...
407 bpos->samples[i].percent =
disasm__calc_percent(notes,408 evsel->idx + i, 409 pos->offset, 410 next ? next->offset :len,
411 &path,&nr_samples);
412 bpos->samples[i].nr =nr_samples;And 'perf annotate --stdio --show-total-period' hasn't the problem, too. Because of the same code (
util/annotate.c:911).But if with '-l', i.e. 'perf annotate --stdio -l --show-total-period', the problem happen. Because 'nr' of
source_line_samplesaren't ordinarily set
insymbol__get_source_line()(util/annotate.c:1634~..)
,so fix it as this patchAre there something I missed or misunderstand ?
Thanks,
TaeungQuoted 83 lines
Quoted 83 lines
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 it was missed to set number of samples of
source_line_samples, so set it ordinarily.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 <[email protected]>Cc Jiri Olsa <[email protected]>Cc Martin Liska <[email protected]>Fixes 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)tools/perf/util/annotate.c +4
-2@@ -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 )tools/perf/util/annotate.h +1
-2@@ -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
Arnaldo,
I think we had a little communication problem. So would you mind if I finally sum up this situation ?
Currently there are the two calculation setting for 'number of samples'. (At util/annotate.c, not TUI code ui/browsers/annotate.c)
A) disasm__calc_percent() -> util/annotate.c:881~
B) symbol__get_source_line() -> util/annotate.c:1634~
If testing them as the three cases,
1) $ perf annotate --stdio -l --show-total-period
2) $ perf annotate --stdio --show-total-period
3) $ perf annotate # using 'k' on TUI
The result is,
1) NG
2) OK
3) OK
The problem of '1)' is to just show '0' zero values for number of samples. Because 'B)' has a bug missing 'nr' of source_line_samples.
So I fix it.
the case '1)' uses 'B)' and 'A)'
the case '2)' uses only 'A)'
the case '3)' uses only 'A)'
I read and analyzed all about 'number of samples' of perf-anntoate. with the cset 0c4a5bcea460 you gave me.
This is my conclusion. What do you think about it ?
Thanks,
Taeung
NOTE: 'A)'(i.e. disasm__calc_percent()) has two alternative logic when using '-l' option or not as below.
888 if (src_line) {
...
903 } else {
...914 }
Quoted 44 lines · Taeung Song
Quoted 16 lines · Arnaldo Carvalho de Melo
Em Tue, Mar 28, 2017 at 11:21:33PM +0900, Taeung Song escreveu:
Quoted 15 lines · Arnaldo Carvalho de Melo
Quoted 11 lines
Em Tue, Mar 28, 2017 at 09:12:05PM +0900, Taeung Song escreveu:
Quoted 3 lines
The option 'show-total-period' works fine without a option '-l'. But if running 'perf annotate --stdio -l --show-total-period', you can see a problem showing only zero '0' for number of samples.
If you do that at that point, don't you have to change the TUI not to do
it again?- Arnaldo
Quoted 6 lines
Quoted 3 lines
Yes, there isn't the same problem when using 't' on TUI of 'perf annotate'.
(As you know, 't' is show-total-period option)Yeah, there is no problem on the TUI, but since you do it in a function taht the TUI uses, it may not be needed to do this in
No, TUI don't use the function I modified in this patch at all. (i.e.
symbol__get_source_line())Only
symbol__tty_annotate()usesymbol__get_source_line().(As you know, annotate TUI use
symbol__tui_annotate())Quoted 4 lines
tools/perf/util/annotate.c_and_ intools/perf/ui/browsers/annotate.c, right?- Arnaldo
Are there something I missed or misunderstand ?
Thanks,
Taeung
SNIP
tip-bot for Taeung Song
merge botperf annotate: Fix missing number of samples for source_line_samples
Commit-ID: 99094a5e941fe88d95cbd594e6a41bee24003ecb Gitweb: http://git.kernel.org/tip/99094a5e941fe88d95cbd594e6a41bee24003ecb Author: Taeung Song <[email protected]> AuthorDate: Tue, 28 Mar 2017 21:12:05 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 4 Apr 2017 21:08:00 -0300
perf annotate: Fix missing number of samples for source_line_samples
The option 'show-total-period' works fine without a option '-l'. But 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 it was missed to set number of samples of source_line_samples, so set it ordinarily.
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
...--- tools/perf/util/annotate.c | 6 ++++-- tools/perf/util/annotate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
tools/perf/util/annotate.c +4 -2
@@ -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 )
tools/perf/util/annotate.h +1 -1
@@ -98,7 +98,7 @@ struct cyc_hist {struct source_line_samples {double percent;double percent_sum; -double nr; +u64 nr; };struct source_line {