diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-05-24 15:28:29 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 09:28:51 -0400 |
commit | e1a91a834d6e1b6616b76b0ba22e7e11d5592c3b (patch) | |
tree | 1b84ae0bdd6692a78e3637887b2bb53bdadc360c /tools/perf/util/annotate.c | |
parent | be3e26d99c3abf4b17728da7bc606dd05419611e (diff) |
perf annotate: __symbol__inc_addr_samples() needs just annotated_source
It only operates on the histograms, so no need for the encompassing
'struct annotation'.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-2se2v7rrjil0kwqywks04ey2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index a6fa49bf879b..a5a6d686004e 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -819,7 +819,7 @@ static int __symbol__account_cycles(struct cyc_hist *ch, | |||
819 | } | 819 | } |
820 | 820 | ||
821 | static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, | 821 | static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, |
822 | struct annotation *notes, int evidx, u64 addr, | 822 | struct annotated_source *src, int evidx, u64 addr, |
823 | struct perf_sample *sample) | 823 | struct perf_sample *sample) |
824 | { | 824 | { |
825 | unsigned offset; | 825 | unsigned offset; |
@@ -835,7 +835,7 @@ static int __symbol__inc_addr_samples(struct symbol *sym, struct map *map, | |||
835 | } | 835 | } |
836 | 836 | ||
837 | offset = addr - sym->start; | 837 | offset = addr - sym->start; |
838 | h = annotation__histogram(notes, evidx); | 838 | h = annotated_source__histogram(src, evidx); |
839 | h->nr_samples++; | 839 | h->nr_samples++; |
840 | h->addr[offset].nr_samples++; | 840 | h->addr[offset].nr_samples++; |
841 | h->period += sample->period; | 841 | h->period += sample->period; |
@@ -874,7 +874,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, | |||
874 | notes = symbol__get_annotation(sym, false); | 874 | notes = symbol__get_annotation(sym, false); |
875 | if (notes == NULL) | 875 | if (notes == NULL) |
876 | return -ENOMEM; | 876 | return -ENOMEM; |
877 | return __symbol__inc_addr_samples(sym, map, notes, evsel->idx, addr, sample); | 877 | return __symbol__inc_addr_samples(sym, map, notes->src, evsel->idx, addr, sample); |
878 | } | 878 | } |
879 | 879 | ||
880 | static int symbol__account_cycles(u64 addr, u64 start, | 880 | static int symbol__account_cycles(u64 addr, u64 start, |