diff options
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index cea25d03f4dd..983b238d5eea 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -115,37 +115,38 @@ static int hist_iter__report_callback(struct hist_entry_iter *iter, | |||
115 | struct report *rep = arg; | 115 | struct report *rep = arg; |
116 | struct hist_entry *he = iter->he; | 116 | struct hist_entry *he = iter->he; |
117 | struct perf_evsel *evsel = iter->evsel; | 117 | struct perf_evsel *evsel = iter->evsel; |
118 | struct perf_sample *sample = iter->sample; | ||
118 | struct mem_info *mi; | 119 | struct mem_info *mi; |
119 | struct branch_info *bi; | 120 | struct branch_info *bi; |
120 | 121 | ||
121 | if (!ui__has_annotation()) | 122 | if (!ui__has_annotation()) |
122 | return 0; | 123 | return 0; |
123 | 124 | ||
124 | hist__account_cycles(iter->sample->branch_stack, al, iter->sample, | 125 | hist__account_cycles(sample->branch_stack, al, sample, |
125 | rep->nonany_branch_mode); | 126 | rep->nonany_branch_mode); |
126 | 127 | ||
127 | if (sort__mode == SORT_MODE__BRANCH) { | 128 | if (sort__mode == SORT_MODE__BRANCH) { |
128 | bi = he->branch_info; | 129 | bi = he->branch_info; |
129 | err = addr_map_symbol__inc_samples(&bi->from, evsel->idx); | 130 | err = addr_map_symbol__inc_samples(&bi->from, sample, evsel->idx); |
130 | if (err) | 131 | if (err) |
131 | goto out; | 132 | goto out; |
132 | 133 | ||
133 | err = addr_map_symbol__inc_samples(&bi->to, evsel->idx); | 134 | err = addr_map_symbol__inc_samples(&bi->to, sample, evsel->idx); |
134 | 135 | ||
135 | } else if (rep->mem_mode) { | 136 | } else if (rep->mem_mode) { |
136 | mi = he->mem_info; | 137 | mi = he->mem_info; |
137 | err = addr_map_symbol__inc_samples(&mi->daddr, evsel->idx); | 138 | err = addr_map_symbol__inc_samples(&mi->daddr, sample, evsel->idx); |
138 | if (err) | 139 | if (err) |
139 | goto out; | 140 | goto out; |
140 | 141 | ||
141 | err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr); | 142 | err = hist_entry__inc_addr_samples(he, sample, evsel->idx, al->addr); |
142 | 143 | ||
143 | } else if (symbol_conf.cumulate_callchain) { | 144 | } else if (symbol_conf.cumulate_callchain) { |
144 | if (single) | 145 | if (single) |
145 | err = hist_entry__inc_addr_samples(he, evsel->idx, | 146 | err = hist_entry__inc_addr_samples(he, sample, evsel->idx, |
146 | al->addr); | 147 | al->addr); |
147 | } else { | 148 | } else { |
148 | err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr); | 149 | err = hist_entry__inc_addr_samples(he, sample, evsel->idx, al->addr); |
149 | } | 150 | } |
150 | 151 | ||
151 | out: | 152 | out: |