Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6e1f601a10cbaa5cda869f844292dd81c519a8e7

Authored by Namhyung Kim
Committed by Arnaldo Carvalho de Melo
1 parent a8bb559bd4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

perf report: Make another loop for linking group hists 

Now the event grouping viewing requires linking all member hists in a
group to the leader's.  Thus hists__output_resort should be called after
linking all events in evlist.

Introduce symbol_conf.event_group flag to determine whether the feature
is enabled or not.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1358845787-1350-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 2 changed files with 14 additions and 2 deletions Inline Diff

tools/perf/builtin-report.c
Diff comments   View file @ 6e1f601
1 /* 1 /*
2 * builtin-report.c 2 * builtin-report.c
3 * 3 *
4 * Builtin report command: Analyze the perf.data input file, 4 * Builtin report command: Analyze the perf.data input file,
5 * look up and read DSOs and symbol information and display 5 * look up and read DSOs and symbol information and display
6 * a histogram of results, along various sorting keys. 6 * a histogram of results, along various sorting keys.
7 */ 7 */
8 #include "builtin.h" 8 #include "builtin.h"
9 9
10 #include "util/util.h" 10 #include "util/util.h"
11 11
12 #include "util/annotate.h" 12 #include "util/annotate.h"
13 #include "util/color.h" 13 #include "util/color.h"
14 #include <linux/list.h> 14 #include <linux/list.h>
15 #include "util/cache.h" 15 #include "util/cache.h"
16 #include <linux/rbtree.h> 16 #include <linux/rbtree.h>
17 #include "util/symbol.h" 17 #include "util/symbol.h"
18 #include "util/callchain.h" 18 #include "util/callchain.h"
19 #include "util/strlist.h" 19 #include "util/strlist.h"
20 #include "util/values.h" 20 #include "util/values.h"
21 21
22 #include "perf.h" 22 #include "perf.h"
23 #include "util/debug.h" 23 #include "util/debug.h"
24 #include "util/evlist.h" 24 #include "util/evlist.h"
25 #include "util/evsel.h" 25 #include "util/evsel.h"
26 #include "util/header.h" 26 #include "util/header.h"
27 #include "util/session.h" 27 #include "util/session.h"
28 #include "util/tool.h" 28 #include "util/tool.h"
29 29
30 #include "util/parse-options.h" 30 #include "util/parse-options.h"
31 #include "util/parse-events.h" 31 #include "util/parse-events.h"
32 32
33 #include "util/thread.h" 33 #include "util/thread.h"
34 #include "util/sort.h" 34 #include "util/sort.h"
35 #include "util/hist.h" 35 #include "util/hist.h"
36 #include "arch/common.h" 36 #include "arch/common.h"
37 37
38 #include <linux/bitmap.h> 38 #include <linux/bitmap.h>
39 39
40 struct perf_report { 40 struct perf_report {
41 struct perf_tool tool; 41 struct perf_tool tool;
42 struct perf_session *session; 42 struct perf_session *session;
43 bool force, use_tui, use_gtk, use_stdio; 43 bool force, use_tui, use_gtk, use_stdio;
44 bool hide_unresolved; 44 bool hide_unresolved;
45 bool dont_use_callchains; 45 bool dont_use_callchains;
46 bool show_full_info; 46 bool show_full_info;
47 bool show_threads; 47 bool show_threads;
48 bool inverted_callchain; 48 bool inverted_callchain;
49 struct perf_read_values show_threads_values; 49 struct perf_read_values show_threads_values;
50 const char *pretty_printing_style; 50 const char *pretty_printing_style;
51 symbol_filter_t annotate_init; 51 symbol_filter_t annotate_init;
52 const char *cpu_list; 52 const char *cpu_list;
53 const char *symbol_filter_str; 53 const char *symbol_filter_str;
54 DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS); 54 DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
55 }; 55 };
56 56
57 static int perf_report__add_branch_hist_entry(struct perf_tool *tool, 57 static int perf_report__add_branch_hist_entry(struct perf_tool *tool,
58 struct addr_location *al, 58 struct addr_location *al,
59 struct perf_sample *sample, 59 struct perf_sample *sample,
60 struct perf_evsel *evsel, 60 struct perf_evsel *evsel,
61 struct machine *machine) 61 struct machine *machine)
62 { 62 {
63 struct perf_report *rep = container_of(tool, struct perf_report, tool); 63 struct perf_report *rep = container_of(tool, struct perf_report, tool);
64 struct symbol *parent = NULL; 64 struct symbol *parent = NULL;
65 int err = 0; 65 int err = 0;
66 unsigned i; 66 unsigned i;
67 struct hist_entry *he; 67 struct hist_entry *he;
68 struct branch_info *bi, *bx; 68 struct branch_info *bi, *bx;
69 69
70 if ((sort__has_parent || symbol_conf.use_callchain) 70 if ((sort__has_parent || symbol_conf.use_callchain)
71 && sample->callchain) { 71 && sample->callchain) {
72 err = machine__resolve_callchain(machine, evsel, al->thread, 72 err = machine__resolve_callchain(machine, evsel, al->thread,
73 sample, &parent); 73 sample, &parent);
74 if (err) 74 if (err)
75 return err; 75 return err;
76 } 76 }
77 77
78 bi = machine__resolve_bstack(machine, al->thread, 78 bi = machine__resolve_bstack(machine, al->thread,
79 sample->branch_stack); 79 sample->branch_stack);
80 if (!bi) 80 if (!bi)
81 return -ENOMEM; 81 return -ENOMEM;
82 82
83 for (i = 0; i < sample->branch_stack->nr; i++) { 83 for (i = 0; i < sample->branch_stack->nr; i++) {
84 if (rep->hide_unresolved && !(bi[i].from.sym && bi[i].to.sym)) 84 if (rep->hide_unresolved && !(bi[i].from.sym && bi[i].to.sym))
85 continue; 85 continue;
86 /* 86 /*
87 * The report shows the percentage of total branches captured 87 * The report shows the percentage of total branches captured
88 * and not events sampled. Thus we use a pseudo period of 1. 88 * and not events sampled. Thus we use a pseudo period of 1.
89 */ 89 */
90 he = __hists__add_branch_entry(&evsel->hists, al, parent, 90 he = __hists__add_branch_entry(&evsel->hists, al, parent,
91 &bi[i], 1); 91 &bi[i], 1);
92 if (he) { 92 if (he) {
93 struct annotation *notes; 93 struct annotation *notes;
94 err = -ENOMEM; 94 err = -ENOMEM;
95 bx = he->branch_info; 95 bx = he->branch_info;
96 if (bx->from.sym && use_browser == 1 && sort__has_sym) { 96 if (bx->from.sym && use_browser == 1 && sort__has_sym) {
97 notes = symbol__annotation(bx->from.sym); 97 notes = symbol__annotation(bx->from.sym);
98 if (!notes->src 98 if (!notes->src
99 && symbol__alloc_hist(bx->from.sym) < 0) 99 && symbol__alloc_hist(bx->from.sym) < 0)
100 goto out; 100 goto out;
101 101
102 err = symbol__inc_addr_samples(bx->from.sym, 102 err = symbol__inc_addr_samples(bx->from.sym,
103 bx->from.map, 103 bx->from.map,
104 evsel->idx, 104 evsel->idx,
105 bx->from.al_addr); 105 bx->from.al_addr);
106 if (err) 106 if (err)
107 goto out; 107 goto out;
108 } 108 }
109 109
110 if (bx->to.sym && use_browser == 1 && sort__has_sym) { 110 if (bx->to.sym && use_browser == 1 && sort__has_sym) {
111 notes = symbol__annotation(bx->to.sym); 111 notes = symbol__annotation(bx->to.sym);
112 if (!notes->src 112 if (!notes->src
113 && symbol__alloc_hist(bx->to.sym) < 0) 113 && symbol__alloc_hist(bx->to.sym) < 0)
114 goto out; 114 goto out;
115 115
116 err = symbol__inc_addr_samples(bx->to.sym, 116 err = symbol__inc_addr_samples(bx->to.sym,
117 bx->to.map, 117 bx->to.map,
118 evsel->idx, 118 evsel->idx,
119 bx->to.al_addr); 119 bx->to.al_addr);
120 if (err) 120 if (err)
121 goto out; 121 goto out;
122 } 122 }
123 evsel->hists.stats.total_period += 1; 123 evsel->hists.stats.total_period += 1;
124 hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE); 124 hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
125 err = 0; 125 err = 0;
126 } else 126 } else
127 return -ENOMEM; 127 return -ENOMEM;
128 } 128 }
129 out: 129 out:
130 return err; 130 return err;
131 } 131 }
132 132
133 static int perf_evsel__add_hist_entry(struct perf_evsel *evsel, 133 static int perf_evsel__add_hist_entry(struct perf_evsel *evsel,
134 struct addr_location *al, 134 struct addr_location *al,
135 struct perf_sample *sample, 135 struct perf_sample *sample,
136 struct machine *machine) 136 struct machine *machine)
137 { 137 {
138 struct symbol *parent = NULL; 138 struct symbol *parent = NULL;
139 int err = 0; 139 int err = 0;
140 struct hist_entry *he; 140 struct hist_entry *he;
141 141
142 if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) { 142 if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
143 err = machine__resolve_callchain(machine, evsel, al->thread, 143 err = machine__resolve_callchain(machine, evsel, al->thread,
144 sample, &parent); 144 sample, &parent);
145 if (err) 145 if (err)
146 return err; 146 return err;
147 } 147 }
148 148
149 he = __hists__add_entry(&evsel->hists, al, parent, sample->period); 149 he = __hists__add_entry(&evsel->hists, al, parent, sample->period);
150 if (he == NULL) 150 if (he == NULL)
151 return -ENOMEM; 151 return -ENOMEM;
152 152
153 if (symbol_conf.use_callchain) { 153 if (symbol_conf.use_callchain) {
154 err = callchain_append(he->callchain, 154 err = callchain_append(he->callchain,
155 &callchain_cursor, 155 &callchain_cursor,
156 sample->period); 156 sample->period);
157 if (err) 157 if (err)
158 return err; 158 return err;
159 } 159 }
160 /* 160 /*
161 * Only in the newt browser we are doing integrated annotation, 161 * Only in the newt browser we are doing integrated annotation,
162 * so we don't allocated the extra space needed because the stdio 162 * so we don't allocated the extra space needed because the stdio
163 * code will not use it. 163 * code will not use it.
164 */ 164 */
165 if (he->ms.sym != NULL && use_browser == 1 && sort__has_sym) { 165 if (he->ms.sym != NULL && use_browser == 1 && sort__has_sym) {
166 struct annotation *notes = symbol__annotation(he->ms.sym); 166 struct annotation *notes = symbol__annotation(he->ms.sym);
167 167
168 assert(evsel != NULL); 168 assert(evsel != NULL);
169 169
170 err = -ENOMEM; 170 err = -ENOMEM;
171 if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0) 171 if (notes->src == NULL && symbol__alloc_hist(he->ms.sym) < 0)
172 goto out; 172 goto out;
173 173
174 err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr); 174 err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
175 } 175 }
176 176
177 evsel->hists.stats.total_period += sample->period; 177 evsel->hists.stats.total_period += sample->period;
178 hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE); 178 hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
179 out: 179 out:
180 return err; 180 return err;
181 } 181 }
182 182
183 183
184 static int process_sample_event(struct perf_tool *tool, 184 static int process_sample_event(struct perf_tool *tool,
185 union perf_event *event, 185 union perf_event *event,
186 struct perf_sample *sample, 186 struct perf_sample *sample,
187 struct perf_evsel *evsel, 187 struct perf_evsel *evsel,
188 struct machine *machine) 188 struct machine *machine)
189 { 189 {
190 struct perf_report *rep = container_of(tool, struct perf_report, tool); 190 struct perf_report *rep = container_of(tool, struct perf_report, tool);
191 struct addr_location al; 191 struct addr_location al;
192 192
193 if (perf_event__preprocess_sample(event, machine, &al, sample, 193 if (perf_event__preprocess_sample(event, machine, &al, sample,
194 rep->annotate_init) < 0) { 194 rep->annotate_init) < 0) {
195 fprintf(stderr, "problem processing %d event, skipping it.\n", 195 fprintf(stderr, "problem processing %d event, skipping it.\n",
196 event->header.type); 196 event->header.type);
197 return -1; 197 return -1;
198 } 198 }
199 199
200 if (al.filtered || (rep->hide_unresolved && al.sym == NULL)) 200 if (al.filtered || (rep->hide_unresolved && al.sym == NULL))
201 return 0; 201 return 0;
202 202
203 if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap)) 203 if (rep->cpu_list && !test_bit(sample->cpu, rep->cpu_bitmap))
204 return 0; 204 return 0;
205 205
206 if (sort__branch_mode == 1) { 206 if (sort__branch_mode == 1) {
207 if (perf_report__add_branch_hist_entry(tool, &al, sample, 207 if (perf_report__add_branch_hist_entry(tool, &al, sample,
208 evsel, machine)) { 208 evsel, machine)) {
209 pr_debug("problem adding lbr entry, skipping event\n"); 209 pr_debug("problem adding lbr entry, skipping event\n");
210 return -1; 210 return -1;
211 } 211 }
212 } else { 212 } else {
213 if (al.map != NULL) 213 if (al.map != NULL)
214 al.map->dso->hit = 1; 214 al.map->dso->hit = 1;
215 215
216 if (perf_evsel__add_hist_entry(evsel, &al, sample, machine)) { 216 if (perf_evsel__add_hist_entry(evsel, &al, sample, machine)) {
217 pr_debug("problem incrementing symbol period, skipping event\n"); 217 pr_debug("problem incrementing symbol period, skipping event\n");
218 return -1; 218 return -1;
219 } 219 }
220 } 220 }
221 return 0; 221 return 0;
222 } 222 }
223 223
224 static int process_read_event(struct perf_tool *tool, 224 static int process_read_event(struct perf_tool *tool,
225 union perf_event *event, 225 union perf_event *event,
226 struct perf_sample *sample __maybe_unused, 226 struct perf_sample *sample __maybe_unused,
227 struct perf_evsel *evsel, 227 struct perf_evsel *evsel,
228 struct machine *machine __maybe_unused) 228 struct machine *machine __maybe_unused)
229 { 229 {
230 struct perf_report *rep = container_of(tool, struct perf_report, tool); 230 struct perf_report *rep = container_of(tool, struct perf_report, tool);
231 231
232 if (rep->show_threads) { 232 if (rep->show_threads) {
233 const char *name = evsel ? perf_evsel__name(evsel) : "unknown"; 233 const char *name = evsel ? perf_evsel__name(evsel) : "unknown";
234 perf_read_values_add_value(&rep->show_threads_values, 234 perf_read_values_add_value(&rep->show_threads_values,
235 event->read.pid, event->read.tid, 235 event->read.pid, event->read.tid,
236 event->read.id, 236 event->read.id,
237 name, 237 name,
238 event->read.value); 238 event->read.value);
239 } 239 }
240 240
241 dump_printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid, 241 dump_printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid,
242 evsel ? perf_evsel__name(evsel) : "FAIL", 242 evsel ? perf_evsel__name(evsel) : "FAIL",
243 event->read.value); 243 event->read.value);
244 244
245 return 0; 245 return 0;
246 } 246 }
247 247
248 /* For pipe mode, sample_type is not currently set */ 248 /* For pipe mode, sample_type is not currently set */
249 static int perf_report__setup_sample_type(struct perf_report *rep) 249 static int perf_report__setup_sample_type(struct perf_report *rep)
250 { 250 {
251 struct perf_session *self = rep->session; 251 struct perf_session *self = rep->session;
252 u64 sample_type = perf_evlist__sample_type(self->evlist); 252 u64 sample_type = perf_evlist__sample_type(self->evlist);
253 253
254 if (!self->fd_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) { 254 if (!self->fd_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) {
255 if (sort__has_parent) { 255 if (sort__has_parent) {
256 ui__error("Selected --sort parent, but no " 256 ui__error("Selected --sort parent, but no "
257 "callchain data. Did you call " 257 "callchain data. Did you call "
258 "'perf record' without -g?\n"); 258 "'perf record' without -g?\n");
259 return -EINVAL; 259 return -EINVAL;
260 } 260 }
261 if (symbol_conf.use_callchain) { 261 if (symbol_conf.use_callchain) {
262 ui__error("Selected -g but no callchain data. Did " 262 ui__error("Selected -g but no callchain data. Did "
263 "you call 'perf record' without -g?\n"); 263 "you call 'perf record' without -g?\n");
264 return -1; 264 return -1;
265 } 265 }
266 } else if (!rep->dont_use_callchains && 266 } else if (!rep->dont_use_callchains &&
267 callchain_param.mode != CHAIN_NONE && 267 callchain_param.mode != CHAIN_NONE &&
268 !symbol_conf.use_callchain) { 268 !symbol_conf.use_callchain) {
269 symbol_conf.use_callchain = true; 269 symbol_conf.use_callchain = true;
270 if (callchain_register_param(&callchain_param) < 0) { 270 if (callchain_register_param(&callchain_param) < 0) {
271 ui__error("Can't register callchain params.\n"); 271 ui__error("Can't register callchain params.\n");
272 return -EINVAL; 272 return -EINVAL;
273 } 273 }
274 } 274 }
275 275
276 if (sort__branch_mode == 1) { 276 if (sort__branch_mode == 1) {
277 if (!self->fd_pipe && 277 if (!self->fd_pipe &&
278 !(sample_type & PERF_SAMPLE_BRANCH_STACK)) { 278 !(sample_type & PERF_SAMPLE_BRANCH_STACK)) {
279 ui__error("Selected -b but no branch data. " 279 ui__error("Selected -b but no branch data. "
280 "Did you call perf record without -b?\n"); 280 "Did you call perf record without -b?\n");
281 return -1; 281 return -1;
282 } 282 }
283 } 283 }
284 284
285 return 0; 285 return 0;
286 } 286 }
287 287
288 extern volatile int session_done; 288 extern volatile int session_done;
289 289
290 static void sig_handler(int sig __maybe_unused) 290 static void sig_handler(int sig __maybe_unused)
291 { 291 {
292 session_done = 1; 292 session_done = 1;
293 } 293 }
294 294
295 static size_t hists__fprintf_nr_sample_events(struct hists *self, 295 static size_t hists__fprintf_nr_sample_events(struct hists *self,
296 const char *evname, FILE *fp) 296 const char *evname, FILE *fp)
297 { 297 {
298 size_t ret; 298 size_t ret;
299 char unit; 299 char unit;
300 unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE]; 300 unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE];
301 u64 nr_events = self->stats.total_period; 301 u64 nr_events = self->stats.total_period;
302 302
303 nr_samples = convert_unit(nr_samples, &unit); 303 nr_samples = convert_unit(nr_samples, &unit);
304 ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit); 304 ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit);
305 if (evname != NULL) 305 if (evname != NULL)
306 ret += fprintf(fp, " of event '%s'", evname); 306 ret += fprintf(fp, " of event '%s'", evname);
307 307
308 ret += fprintf(fp, "\n# Event count (approx.): %" PRIu64, nr_events); 308 ret += fprintf(fp, "\n# Event count (approx.): %" PRIu64, nr_events);
309 return ret + fprintf(fp, "\n#\n"); 309 return ret + fprintf(fp, "\n#\n");
310 } 310 }
311 311
312 static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, 312 static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
313 struct perf_report *rep, 313 struct perf_report *rep,
314 const char *help) 314 const char *help)
315 { 315 {
316 struct perf_evsel *pos; 316 struct perf_evsel *pos;
317 317
318 list_for_each_entry(pos, &evlist->entries, node) { 318 list_for_each_entry(pos, &evlist->entries, node) {
319 struct hists *hists = &pos->hists; 319 struct hists *hists = &pos->hists;
320 const char *evname = perf_evsel__name(pos); 320 const char *evname = perf_evsel__name(pos);
321 321
322 hists__fprintf_nr_sample_events(hists, evname, stdout); 322 hists__fprintf_nr_sample_events(hists, evname, stdout);
323 hists__fprintf(hists, true, 0, 0, stdout); 323 hists__fprintf(hists, true, 0, 0, stdout);
324 fprintf(stdout, "\n\n"); 324 fprintf(stdout, "\n\n");
325 } 325 }
326 326
327 if (sort_order == default_sort_order && 327 if (sort_order == default_sort_order &&
328 parent_pattern == default_parent_pattern) { 328 parent_pattern == default_parent_pattern) {
329 fprintf(stdout, "#\n# (%s)\n#\n", help); 329 fprintf(stdout, "#\n# (%s)\n#\n", help);
330 330
331 if (rep->show_threads) { 331 if (rep->show_threads) {
332 bool style = !strcmp(rep->pretty_printing_style, "raw"); 332 bool style = !strcmp(rep->pretty_printing_style, "raw");
333 perf_read_values_display(stdout, &rep->show_threads_values, 333 perf_read_values_display(stdout, &rep->show_threads_values,
334 style); 334 style);
335 perf_read_values_destroy(&rep->show_threads_values); 335 perf_read_values_destroy(&rep->show_threads_values);
336 } 336 }
337 } 337 }
338 338
339 return 0; 339 return 0;
340 } 340 }
341 341
342 static int __cmd_report(struct perf_report *rep) 342 static int __cmd_report(struct perf_report *rep)
343 { 343 {
344 int ret = -EINVAL; 344 int ret = -EINVAL;
345 u64 nr_samples; 345 u64 nr_samples;
346 struct perf_session *session = rep->session; 346 struct perf_session *session = rep->session;
347 struct perf_evsel *pos; 347 struct perf_evsel *pos;
348 struct map *kernel_map; 348 struct map *kernel_map;
349 struct kmap *kernel_kmap; 349 struct kmap *kernel_kmap;
350 const char *help = "For a higher level overview, try: perf report --sort comm,dso"; 350 const char *help = "For a higher level overview, try: perf report --sort comm,dso";
351 351
352 signal(SIGINT, sig_handler); 352 signal(SIGINT, sig_handler);
353 353
354 if (rep->cpu_list) { 354 if (rep->cpu_list) {
355 ret = perf_session__cpu_bitmap(session, rep->cpu_list, 355 ret = perf_session__cpu_bitmap(session, rep->cpu_list,
356 rep->cpu_bitmap); 356 rep->cpu_bitmap);
357 if (ret) 357 if (ret)
358 goto out_delete; 358 goto out_delete;
359 } 359 }
360 360
361 if (use_browser <= 0) 361 if (use_browser <= 0)
362 perf_session__fprintf_info(session, stdout, rep->show_full_info); 362 perf_session__fprintf_info(session, stdout, rep->show_full_info);
363 363
364 if (rep->show_threads) 364 if (rep->show_threads)
365 perf_read_values_init(&rep->show_threads_values); 365 perf_read_values_init(&rep->show_threads_values);
366 366
367 ret = perf_report__setup_sample_type(rep); 367 ret = perf_report__setup_sample_type(rep);
368 if (ret) 368 if (ret)
369 goto out_delete; 369 goto out_delete;
370 370
371 ret = perf_session__process_events(session, &rep->tool); 371 ret = perf_session__process_events(session, &rep->tool);
372 if (ret) 372 if (ret)
373 goto out_delete; 373 goto out_delete;
374 374
375 kernel_map = session->machines.host.vmlinux_maps[MAP__FUNCTION]; 375 kernel_map = session->machines.host.vmlinux_maps[MAP__FUNCTION];
376 kernel_kmap = map__kmap(kernel_map); 376 kernel_kmap = map__kmap(kernel_map);
377 if (kernel_map == NULL || 377 if (kernel_map == NULL ||
378 (kernel_map->dso->hit && 378 (kernel_map->dso->hit &&
379 (kernel_kmap->ref_reloc_sym == NULL || 379 (kernel_kmap->ref_reloc_sym == NULL ||
380 kernel_kmap->ref_reloc_sym->addr == 0))) { 380 kernel_kmap->ref_reloc_sym->addr == 0))) {
381 const char *desc = 381 const char *desc =
382 "As no suitable kallsyms nor vmlinux was found, kernel samples\n" 382 "As no suitable kallsyms nor vmlinux was found, kernel samples\n"
383 "can't be resolved."; 383 "can't be resolved.";
384 384
385 if (kernel_map) { 385 if (kernel_map) {
386 const struct dso *kdso = kernel_map->dso; 386 const struct dso *kdso = kernel_map->dso;
387 if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) { 387 if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) {
388 desc = "If some relocation was applied (e.g. " 388 desc = "If some relocation was applied (e.g. "
389 "kexec) symbols may be misresolved."; 389 "kexec) symbols may be misresolved.";
390 } 390 }
391 } 391 }
392 392
393 ui__warning( 393 ui__warning(
394 "Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n" 394 "Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
395 "Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n" 395 "Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
396 "Samples in kernel modules can't be resolved as well.\n\n", 396 "Samples in kernel modules can't be resolved as well.\n\n",
397 desc); 397 desc);
398 } 398 }
399 399
400 if (verbose > 3) 400 if (verbose > 3)
401 perf_session__fprintf(session, stdout); 401 perf_session__fprintf(session, stdout);
402 402
403 if (verbose > 2) 403 if (verbose > 2)
404 perf_session__fprintf_dsos(session, stdout); 404 perf_session__fprintf_dsos(session, stdout);
405 405
406 if (dump_trace) { 406 if (dump_trace) {
407 perf_session__fprintf_nr_events(session, stdout); 407 perf_session__fprintf_nr_events(session, stdout);
408 goto out_delete; 408 goto out_delete;
409 } 409 }
410 410
411 nr_samples = 0; 411 nr_samples = 0;
412 list_for_each_entry(pos, &session->evlist->entries, node) { 412 list_for_each_entry(pos, &session->evlist->entries, node) {
413 struct hists *hists = &pos->hists; 413 struct hists *hists = &pos->hists;
414 414
415 if (pos->idx == 0) 415 if (pos->idx == 0)
416 hists->symbol_filter_str = rep->symbol_filter_str; 416 hists->symbol_filter_str = rep->symbol_filter_str;
417 417
418 hists__collapse_resort(hists); 418 hists__collapse_resort(hists);
419 hists__output_resort(hists);
420 nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE]; 419 nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE];
420
421 /* Non-group events are considered as leader */
422 if (symbol_conf.event_group &&
423 !perf_evsel__is_group_leader(pos)) {
424 struct hists *leader_hists = &pos->leader->hists;
425
426 hists__match(leader_hists, hists);
427 hists__link(leader_hists, hists);
428 }
421 } 429 }
422 430
423 if (nr_samples == 0) { 431 if (nr_samples == 0) {
424 ui__error("The %s file has no samples!\n", session->filename); 432 ui__error("The %s file has no samples!\n", session->filename);
425 goto out_delete; 433 goto out_delete;
426 } 434 }
435
436 list_for_each_entry(pos, &session->evlist->entries, node)
437 hists__output_resort(&pos->hists);
427 438
428 if (use_browser > 0) { 439 if (use_browser > 0) {
429 if (use_browser == 1) { 440 if (use_browser == 1) {
430 perf_evlist__tui_browse_hists(session->evlist, help, 441 perf_evlist__tui_browse_hists(session->evlist, help,
431 NULL, 442 NULL,
432 &session->header.env); 443 &session->header.env);
433 } else if (use_browser == 2) { 444 } else if (use_browser == 2) {
434 perf_evlist__gtk_browse_hists(session->evlist, help, 445 perf_evlist__gtk_browse_hists(session->evlist, help,
435 NULL); 446 NULL);
436 } 447 }
437 } else 448 } else
438 perf_evlist__tty_browse_hists(session->evlist, rep, help); 449 perf_evlist__tty_browse_hists(session->evlist, rep, help);
439 450
440 out_delete: 451 out_delete:
441 /* 452 /*
442 * Speed up the exit process, for large files this can 453 * Speed up the exit process, for large files this can
443 * take quite a while. 454 * take quite a while.
444 * 455 *
445 * XXX Enable this when using valgrind or if we ever 456 * XXX Enable this when using valgrind or if we ever
446 * librarize this command. 457 * librarize this command.
447 * 458 *
448 * Also experiment with obstacks to see how much speed 459 * Also experiment with obstacks to see how much speed
449 * up we'll get here. 460 * up we'll get here.
450 * 461 *
451 * perf_session__delete(session); 462 * perf_session__delete(session);
452 */ 463 */
453 return ret; 464 return ret;
454 } 465 }
455 466
456 static int 467 static int
457 parse_callchain_opt(const struct option *opt, const char *arg, int unset) 468 parse_callchain_opt(const struct option *opt, const char *arg, int unset)
458 { 469 {
459 struct perf_report *rep = (struct perf_report *)opt->value; 470 struct perf_report *rep = (struct perf_report *)opt->value;
460 char *tok, *tok2; 471 char *tok, *tok2;
461 char *endptr; 472 char *endptr;
462 473
463 /* 474 /*
464 * --no-call-graph 475 * --no-call-graph
465 */ 476 */
466 if (unset) { 477 if (unset) {
467 rep->dont_use_callchains = true; 478 rep->dont_use_callchains = true;
468 return 0; 479 return 0;
469 } 480 }
470 481
471 symbol_conf.use_callchain = true; 482 symbol_conf.use_callchain = true;
472 483
473 if (!arg) 484 if (!arg)
474 return 0; 485 return 0;
475 486
476 tok = strtok((char *)arg, ","); 487 tok = strtok((char *)arg, ",");
477 if (!tok) 488 if (!tok)
478 return -1; 489 return -1;
479 490
480 /* get the output mode */ 491 /* get the output mode */
481 if (!strncmp(tok, "graph", strlen(arg))) 492 if (!strncmp(tok, "graph", strlen(arg)))
482 callchain_param.mode = CHAIN_GRAPH_ABS; 493 callchain_param.mode = CHAIN_GRAPH_ABS;
483 494
484 else if (!strncmp(tok, "flat", strlen(arg))) 495 else if (!strncmp(tok, "flat", strlen(arg)))
485 callchain_param.mode = CHAIN_FLAT; 496 callchain_param.mode = CHAIN_FLAT;
486 497
487 else if (!strncmp(tok, "fractal", strlen(arg))) 498 else if (!strncmp(tok, "fractal", strlen(arg)))
488 callchain_param.mode = CHAIN_GRAPH_REL; 499 callchain_param.mode = CHAIN_GRAPH_REL;
489 500
490 else if (!strncmp(tok, "none", strlen(arg))) { 501 else if (!strncmp(tok, "none", strlen(arg))) {
491 callchain_param.mode = CHAIN_NONE; 502 callchain_param.mode = CHAIN_NONE;
492 symbol_conf.use_callchain = false; 503 symbol_conf.use_callchain = false;
493 504
494 return 0; 505 return 0;
495 } 506 }
496 507
497 else 508 else
498 return -1; 509 return -1;
499 510
500 /* get the min percentage */ 511 /* get the min percentage */
501 tok = strtok(NULL, ","); 512 tok = strtok(NULL, ",");
502 if (!tok) 513 if (!tok)
503 goto setup; 514 goto setup;
504 515
505 callchain_param.min_percent = strtod(tok, &endptr); 516 callchain_param.min_percent = strtod(tok, &endptr);
506 if (tok == endptr) 517 if (tok == endptr)
507 return -1; 518 return -1;
508 519
509 /* get the print limit */ 520 /* get the print limit */
510 tok2 = strtok(NULL, ","); 521 tok2 = strtok(NULL, ",");
511 if (!tok2) 522 if (!tok2)
512 goto setup; 523 goto setup;
513 524
514 if (tok2[0] != 'c') { 525 if (tok2[0] != 'c') {
515 callchain_param.print_limit = strtoul(tok2, &endptr, 0); 526 callchain_param.print_limit = strtoul(tok2, &endptr, 0);
516 tok2 = strtok(NULL, ","); 527 tok2 = strtok(NULL, ",");
517 if (!tok2) 528 if (!tok2)
518 goto setup; 529 goto setup;
519 } 530 }
520 531
521 /* get the call chain order */ 532 /* get the call chain order */
522 if (!strcmp(tok2, "caller")) 533 if (!strcmp(tok2, "caller"))
523 callchain_param.order = ORDER_CALLER; 534 callchain_param.order = ORDER_CALLER;
524 else if (!strcmp(tok2, "callee")) 535 else if (!strcmp(tok2, "callee"))
525 callchain_param.order = ORDER_CALLEE; 536 callchain_param.order = ORDER_CALLEE;
526 else 537 else
527 return -1; 538 return -1;
528 setup: 539 setup:
529 if (callchain_register_param(&callchain_param) < 0) { 540 if (callchain_register_param(&callchain_param) < 0) {
530 fprintf(stderr, "Can't register callchain params\n"); 541 fprintf(stderr, "Can't register callchain params\n");
531 return -1; 542 return -1;
532 } 543 }
533 return 0; 544 return 0;
534 } 545 }
535 546
536 static int 547 static int
537 parse_branch_mode(const struct option *opt __maybe_unused, 548 parse_branch_mode(const struct option *opt __maybe_unused,
538 const char *str __maybe_unused, int unset) 549 const char *str __maybe_unused, int unset)
539 { 550 {
540 sort__branch_mode = !unset; 551 sort__branch_mode = !unset;
541 return 0; 552 return 0;
542 } 553 }
543 554
544 int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 555 int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
545 { 556 {
546 struct perf_session *session; 557 struct perf_session *session;
547 struct stat st; 558 struct stat st;
548 bool has_br_stack = false; 559 bool has_br_stack = false;
549 int ret = -1; 560 int ret = -1;
550 char callchain_default_opt[] = "fractal,0.5,callee"; 561 char callchain_default_opt[] = "fractal,0.5,callee";
551 const char * const report_usage[] = { 562 const char * const report_usage[] = {
552 "perf report [<options>]", 563 "perf report [<options>]",
553 NULL 564 NULL
554 }; 565 };
555 struct perf_report report = { 566 struct perf_report report = {
556 .tool = { 567 .tool = {
557 .sample = process_sample_event, 568 .sample = process_sample_event,
558 .mmap = perf_event__process_mmap, 569 .mmap = perf_event__process_mmap,
559 .comm = perf_event__process_comm, 570 .comm = perf_event__process_comm,
560 .exit = perf_event__process_exit, 571 .exit = perf_event__process_exit,
561 .fork = perf_event__process_fork, 572 .fork = perf_event__process_fork,
562 .lost = perf_event__process_lost, 573 .lost = perf_event__process_lost,
563 .read = process_read_event, 574 .read = process_read_event,
564 .attr = perf_event__process_attr, 575 .attr = perf_event__process_attr,
565 .event_type = perf_event__process_event_type, 576 .event_type = perf_event__process_event_type,
566 .tracing_data = perf_event__process_tracing_data, 577 .tracing_data = perf_event__process_tracing_data,
567 .build_id = perf_event__process_build_id, 578 .build_id = perf_event__process_build_id,
568 .ordered_samples = true, 579 .ordered_samples = true,
569 .ordering_requires_timestamps = true, 580 .ordering_requires_timestamps = true,
570 }, 581 },
571 .pretty_printing_style = "normal", 582 .pretty_printing_style = "normal",
572 }; 583 };
573 const struct option options[] = { 584 const struct option options[] = {
574 OPT_STRING('i', "input", &input_name, "file", 585 OPT_STRING('i', "input", &input_name, "file",
575 "input file name"), 586 "input file name"),
576 OPT_INCR('v', "verbose", &verbose, 587 OPT_INCR('v', "verbose", &verbose,
577 "be more verbose (show symbol address, etc)"), 588 "be more verbose (show symbol address, etc)"),
578 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, 589 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
579 "dump raw trace in ASCII"), 590 "dump raw trace in ASCII"),
580 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, 591 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
581 "file", "vmlinux pathname"), 592 "file", "vmlinux pathname"),
582 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, 593 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
583 "file", "kallsyms pathname"), 594 "file", "kallsyms pathname"),
584 OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"), 595 OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"),
585 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, 596 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
586 "load module symbols - WARNING: use only with -k and LIVE kernel"), 597 "load module symbols - WARNING: use only with -k and LIVE kernel"),
587 OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples, 598 OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
588 "Show a column with the number of samples"), 599 "Show a column with the number of samples"),
589 OPT_BOOLEAN('T', "threads", &report.show_threads, 600 OPT_BOOLEAN('T', "threads", &report.show_threads,
590 "Show per-thread event counters"), 601 "Show per-thread event counters"),
591 OPT_STRING(0, "pretty", &report.pretty_printing_style, "key", 602 OPT_STRING(0, "pretty", &report.pretty_printing_style, "key",
592 "pretty printing style key: normal raw"), 603 "pretty printing style key: normal raw"),
593 OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"), 604 OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"),
594 OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"), 605 OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"),
595 OPT_BOOLEAN(0, "stdio", &report.use_stdio, 606 OPT_BOOLEAN(0, "stdio", &report.use_stdio,
596 "Use the stdio interface"), 607 "Use the stdio interface"),
597 OPT_STRING('s', "sort", &sort_order, "key[,key2...]", 608 OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
598 "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline," 609 "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline,"
599 " dso_to, dso_from, symbol_to, symbol_from, mispredict"), 610 " dso_to, dso_from, symbol_to, symbol_from, mispredict"),
600 OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization, 611 OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
601 "Show sample percentage for different cpu modes"), 612 "Show sample percentage for different cpu modes"),
602 OPT_STRING('p', "parent", &parent_pattern, "regex", 613 OPT_STRING('p', "parent", &parent_pattern, "regex",
603 "regex filter to identify parent, see: '--sort parent'"), 614 "regex filter to identify parent, see: '--sort parent'"),
604 OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other, 615 OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
605 "Only display entries with parent-match"), 616 "Only display entries with parent-match"),
606 OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order", 617 OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",
607 "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. " 618 "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. "
608 "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt), 619 "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),
609 OPT_BOOLEAN('G', "inverted", &report.inverted_callchain, 620 OPT_BOOLEAN('G', "inverted", &report.inverted_callchain,
610 "alias for inverted call graph"), 621 "alias for inverted call graph"),
611 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", 622 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
612 "only consider symbols in these dsos"), 623 "only consider symbols in these dsos"),
613 OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]", 624 OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
614 "only consider symbols in these comms"), 625 "only consider symbols in these comms"),
615 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", 626 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
616 "only consider these symbols"), 627 "only consider these symbols"),
617 OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter", 628 OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter",
618 "only show symbols that (partially) match with this filter"), 629 "only show symbols that (partially) match with this filter"),
619 OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str, 630 OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str,
620 "width[,width...]", 631 "width[,width...]",
621 "don't try to adjust column width, use these fixed values"), 632 "don't try to adjust column width, use these fixed values"),
622 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", 633 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
623 "separator for columns, no spaces will be added between " 634 "separator for columns, no spaces will be added between "
624 "columns '.' is reserved."), 635 "columns '.' is reserved."),
625 OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved, 636 OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved,
626 "Only display entries resolved to a symbol"), 637 "Only display entries resolved to a symbol"),
627 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", 638 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
628 "Look for files with symbols relative to this directory"), 639 "Look for files with symbols relative to this directory"),
629 OPT_STRING('C', "cpu", &report.cpu_list, "cpu", 640 OPT_STRING('C', "cpu", &report.cpu_list, "cpu",
630 "list of cpus to profile"), 641 "list of cpus to profile"),
631 OPT_BOOLEAN('I', "show-info", &report.show_full_info, 642 OPT_BOOLEAN('I', "show-info", &report.show_full_info,
632 "Display extended information about perf.data file"), 643 "Display extended information about perf.data file"),
633 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src, 644 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
634 "Interleave source code with assembly code (default)"), 645 "Interleave source code with assembly code (default)"),
635 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw, 646 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
636 "Display raw encoding of assembly instructions (default)"), 647 "Display raw encoding of assembly instructions (default)"),
637 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", 648 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
638 "Specify disassembler style (e.g. -M intel for intel syntax)"), 649 "Specify disassembler style (e.g. -M intel for intel syntax)"),
639 OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, 650 OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
640 "Show a column with the sum of periods"), 651 "Show a column with the sum of periods"),
641 OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "", 652 OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "",
642 "use branch records for histogram filling", parse_branch_mode), 653 "use branch records for histogram filling", parse_branch_mode),
643 OPT_STRING(0, "objdump", &objdump_path, "path", 654 OPT_STRING(0, "objdump", &objdump_path, "path",
644 "objdump binary to use for disassembly and annotations"), 655 "objdump binary to use for disassembly and annotations"),
645 OPT_END() 656 OPT_END()
646 }; 657 };
647 658
648 argc = parse_options(argc, argv, options, report_usage, 0); 659 argc = parse_options(argc, argv, options, report_usage, 0);
649 660
650 if (report.use_stdio) 661 if (report.use_stdio)
651 use_browser = 0; 662 use_browser = 0;
652 else if (report.use_tui) 663 else if (report.use_tui)
653 use_browser = 1; 664 use_browser = 1;
654 else if (report.use_gtk) 665 else if (report.use_gtk)
655 use_browser = 2; 666 use_browser = 2;
656 667
657 if (report.inverted_callchain) 668 if (report.inverted_callchain)
658 callchain_param.order = ORDER_CALLER; 669 callchain_param.order = ORDER_CALLER;
659 670
660 if (!input_name || !strlen(input_name)) { 671 if (!input_name || !strlen(input_name)) {
661 if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode)) 672 if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode))
662 input_name = "-"; 673 input_name = "-";
663 else 674 else
664 input_name = "perf.data"; 675 input_name = "perf.data";
665 } 676 }
666 session = perf_session__new(input_name, O_RDONLY, 677 session = perf_session__new(input_name, O_RDONLY,
667 report.force, false, &report.tool); 678 report.force, false, &report.tool);
668 if (session == NULL) 679 if (session == NULL)
669 return -ENOMEM; 680 return -ENOMEM;
670 681
671 report.session = session; 682 report.session = session;
672 683
673 has_br_stack = perf_header__has_feat(&session->header, 684 has_br_stack = perf_header__has_feat(&session->header,
674 HEADER_BRANCH_STACK); 685 HEADER_BRANCH_STACK);
675 686
676 if (sort__branch_mode == -1 && has_br_stack) 687 if (sort__branch_mode == -1 && has_br_stack)
677 sort__branch_mode = 1; 688 sort__branch_mode = 1;
678 689
679 /* sort__branch_mode could be 0 if --no-branch-stack */ 690 /* sort__branch_mode could be 0 if --no-branch-stack */
680 if (sort__branch_mode == 1) { 691 if (sort__branch_mode == 1) {
681 /* 692 /*
682 * if no sort_order is provided, then specify 693 * if no sort_order is provided, then specify
683 * branch-mode specific order 694 * branch-mode specific order
684 */ 695 */
685 if (sort_order == default_sort_order) 696 if (sort_order == default_sort_order)
686 sort_order = "comm,dso_from,symbol_from," 697 sort_order = "comm,dso_from,symbol_from,"
687 "dso_to,symbol_to"; 698 "dso_to,symbol_to";
688 699
689 } 700 }
690 701
691 if (strcmp(input_name, "-") != 0) 702 if (strcmp(input_name, "-") != 0)
692 setup_browser(true); 703 setup_browser(true);
693 else { 704 else {
694 use_browser = 0; 705 use_browser = 0;
695 perf_hpp__column_enable(PERF_HPP__OVERHEAD); 706 perf_hpp__column_enable(PERF_HPP__OVERHEAD);
696 perf_hpp__init(); 707 perf_hpp__init();
697 } 708 }
698 709
699 setup_sorting(report_usage, options); 710 setup_sorting(report_usage, options);
700 711
701 /* 712 /*
702 * Only in the newt browser we are doing integrated annotation, 713 * Only in the newt browser we are doing integrated annotation,
703 * so don't allocate extra space that won't be used in the stdio 714 * so don't allocate extra space that won't be used in the stdio
704 * implementation. 715 * implementation.
705 */ 716 */
706 if (use_browser == 1 && sort__has_sym) { 717 if (use_browser == 1 && sort__has_sym) {
707 symbol_conf.priv_size = sizeof(struct annotation); 718 symbol_conf.priv_size = sizeof(struct annotation);
708 report.annotate_init = symbol__annotate_init; 719 report.annotate_init = symbol__annotate_init;
709 /* 720 /*
710 * For searching by name on the "Browse map details". 721 * For searching by name on the "Browse map details".
711 * providing it only in verbose mode not to bloat too 722 * providing it only in verbose mode not to bloat too
712 * much struct symbol. 723 * much struct symbol.
713 */ 724 */
714 if (verbose) { 725 if (verbose) {
715 /* 726 /*
716 * XXX: Need to provide a less kludgy way to ask for 727 * XXX: Need to provide a less kludgy way to ask for
717 * more space per symbol, the u32 is for the index on 728 * more space per symbol, the u32 is for the index on
718 * the ui browser. 729 * the ui browser.
719 * See symbol__browser_index. 730 * See symbol__browser_index.
720 */ 731 */
721 symbol_conf.priv_size += sizeof(u32); 732 symbol_conf.priv_size += sizeof(u32);
722 symbol_conf.sort_by_name = true; 733 symbol_conf.sort_by_name = true;
723 } 734 }
724 } 735 }
725 736
726 if (symbol__init() < 0) 737 if (symbol__init() < 0)
727 goto error; 738 goto error;
728 739
729 if (parent_pattern != default_parent_pattern) { 740 if (parent_pattern != default_parent_pattern) {
730 if (sort_dimension__add("parent") < 0) 741 if (sort_dimension__add("parent") < 0)
731 goto error; 742 goto error;
732 743
733 /* 744 /*
734 * Only show the parent fields if we explicitly 745 * Only show the parent fields if we explicitly
735 * sort that way. If we only use parent machinery 746 * sort that way. If we only use parent machinery
736 * for filtering, we don't want it. 747 * for filtering, we don't want it.
737 */ 748 */
738 if (!strstr(sort_order, "parent")) 749 if (!strstr(sort_order, "parent"))
739 sort_parent.elide = 1; 750 sort_parent.elide = 1;
740 } else 751 } else
741 symbol_conf.exclude_other = false; 752 symbol_conf.exclude_other = false;
742 753
743 if (argc) { 754 if (argc) {
744 /* 755 /*
745 * Special case: if there's an argument left then assume that 756 * Special case: if there's an argument left then assume that
746 * it's a symbol filter: 757 * it's a symbol filter:
747 */ 758 */
748 if (argc > 1) 759 if (argc > 1)
749 usage_with_options(report_usage, options); 760 usage_with_options(report_usage, options);
750 761
751 report.symbol_filter_str = argv[0]; 762 report.symbol_filter_str = argv[0];
752 } 763 }
753 764
754 sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout); 765 sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
755 766
756 if (sort__branch_mode == 1) { 767 if (sort__branch_mode == 1) {
757 sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout); 768 sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout);
758 sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout); 769 sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout);
759 sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout); 770 sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout);
760 sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout); 771 sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout);
761 } else { 772 } else {
762 sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout); 773 sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
763 sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout); 774 sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
764 } 775 }
765 776
766 ret = __cmd_report(&report); 777 ret = __cmd_report(&report);
767 error: 778 error:
768 perf_session__delete(session); 779 perf_session__delete(session);
769 return ret; 780 return ret;
770 } 781 }
tools/perf/util/symbol.h
Diff comments   View file @ 6e1f601
1 #ifndef __PERF_SYMBOL 1 #ifndef __PERF_SYMBOL
2 #define __PERF_SYMBOL 1 2 #define __PERF_SYMBOL 1
3 3
4 #include <linux/types.h> 4 #include <linux/types.h>
5 #include <stdbool.h> 5 #include <stdbool.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 #include "map.h" 7 #include "map.h"
8 #include "../perf.h" 8 #include "../perf.h"
9 #include <linux/list.h> 9 #include <linux/list.h>
10 #include <linux/rbtree.h> 10 #include <linux/rbtree.h>
11 #include <stdio.h> 11 #include <stdio.h>
12 #include <byteswap.h> 12 #include <byteswap.h>
13 #include <libgen.h> 13 #include <libgen.h>
14 #include "build-id.h" 14 #include "build-id.h"
15 15
16 #ifdef LIBELF_SUPPORT 16 #ifdef LIBELF_SUPPORT
17 #include <libelf.h> 17 #include <libelf.h>
18 #include <gelf.h> 18 #include <gelf.h>
19 #endif 19 #endif
20 #include <elf.h> 20 #include <elf.h>
21 21
22 #include "dso.h" 22 #include "dso.h"
23 23
24 #ifdef HAVE_CPLUS_DEMANGLE 24 #ifdef HAVE_CPLUS_DEMANGLE
25 extern char *cplus_demangle(const char *, int); 25 extern char *cplus_demangle(const char *, int);
26 26
27 static inline char *bfd_demangle(void __maybe_unused *v, const char *c, int i) 27 static inline char *bfd_demangle(void __maybe_unused *v, const char *c, int i)
28 { 28 {
29 return cplus_demangle(c, i); 29 return cplus_demangle(c, i);
30 } 30 }
31 #else 31 #else
32 #ifdef NO_DEMANGLE 32 #ifdef NO_DEMANGLE
33 static inline char *bfd_demangle(void __maybe_unused *v, 33 static inline char *bfd_demangle(void __maybe_unused *v,
34 const char __maybe_unused *c, 34 const char __maybe_unused *c,
35 int __maybe_unused i) 35 int __maybe_unused i)
36 { 36 {
37 return NULL; 37 return NULL;
38 } 38 }
39 #else 39 #else
40 #define PACKAGE 'perf' 40 #define PACKAGE 'perf'
41 #include <bfd.h> 41 #include <bfd.h>
42 #endif 42 #endif
43 #endif 43 #endif
44 44
45 /* 45 /*
46 * libelf 0.8.x and earlier do not support ELF_C_READ_MMAP; 46 * libelf 0.8.x and earlier do not support ELF_C_READ_MMAP;
47 * for newer versions we can use mmap to reduce memory usage: 47 * for newer versions we can use mmap to reduce memory usage:
48 */ 48 */
49 #ifdef LIBELF_MMAP 49 #ifdef LIBELF_MMAP
50 # define PERF_ELF_C_READ_MMAP ELF_C_READ_MMAP 50 # define PERF_ELF_C_READ_MMAP ELF_C_READ_MMAP
51 #else 51 #else
52 # define PERF_ELF_C_READ_MMAP ELF_C_READ 52 # define PERF_ELF_C_READ_MMAP ELF_C_READ
53 #endif 53 #endif
54 54
55 #ifndef DMGL_PARAMS 55 #ifndef DMGL_PARAMS
56 #define DMGL_PARAMS (1 << 0) /* Include function args */ 56 #define DMGL_PARAMS (1 << 0) /* Include function args */
57 #define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */ 57 #define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */
58 #endif 58 #endif
59 59
60 /** struct symbol - symtab entry 60 /** struct symbol - symtab entry
61 * 61 *
62 * @ignore - resolvable but tools ignore it (e.g. idle routines) 62 * @ignore - resolvable but tools ignore it (e.g. idle routines)
63 */ 63 */
64 struct symbol { 64 struct symbol {
65 struct rb_node rb_node; 65 struct rb_node rb_node;
66 u64 start; 66 u64 start;
67 u64 end; 67 u64 end;
68 u16 namelen; 68 u16 namelen;
69 u8 binding; 69 u8 binding;
70 bool ignore; 70 bool ignore;
71 char name[0]; 71 char name[0];
72 }; 72 };
73 73
74 void symbol__delete(struct symbol *sym); 74 void symbol__delete(struct symbol *sym);
75 void symbols__delete(struct rb_root *symbols); 75 void symbols__delete(struct rb_root *symbols);
76 76
77 static inline size_t symbol__size(const struct symbol *sym) 77 static inline size_t symbol__size(const struct symbol *sym)
78 { 78 {
79 return sym->end - sym->start + 1; 79 return sym->end - sym->start + 1;
80 } 80 }
81 81
82 struct strlist; 82 struct strlist;
83 83
84 struct symbol_conf { 84 struct symbol_conf {
85 unsigned short priv_size; 85 unsigned short priv_size;
86 unsigned short nr_events; 86 unsigned short nr_events;
87 bool try_vmlinux_path, 87 bool try_vmlinux_path,
88 show_kernel_path, 88 show_kernel_path,
89 use_modules, 89 use_modules,
90 sort_by_name, 90 sort_by_name,
91 show_nr_samples, 91 show_nr_samples,
92 show_total_period, 92 show_total_period,
93 use_callchain, 93 use_callchain,
94 exclude_other, 94 exclude_other,
95 show_cpu_utilization, 95 show_cpu_utilization,
96 initialized, 96 initialized,
97 kptr_restrict, 97 kptr_restrict,
98 annotate_asm_raw, 98 annotate_asm_raw,
99 annotate_src; 99 annotate_src,
100 event_group;
100 const char *vmlinux_name, 101 const char *vmlinux_name,
101 *kallsyms_name, 102 *kallsyms_name,
102 *source_prefix, 103 *source_prefix,
103 *field_sep; 104 *field_sep;
104 const char *default_guest_vmlinux_name, 105 const char *default_guest_vmlinux_name,
105 *default_guest_kallsyms, 106 *default_guest_kallsyms,
106 *default_guest_modules; 107 *default_guest_modules;
107 const char *guestmount; 108 const char *guestmount;
108 const char *dso_list_str, 109 const char *dso_list_str,
109 *comm_list_str, 110 *comm_list_str,
110 *sym_list_str, 111 *sym_list_str,
111 *col_width_list_str; 112 *col_width_list_str;
112 struct strlist *dso_list, 113 struct strlist *dso_list,
113 *comm_list, 114 *comm_list,
114 *sym_list, 115 *sym_list,
115 *dso_from_list, 116 *dso_from_list,
116 *dso_to_list, 117 *dso_to_list,
117 *sym_from_list, 118 *sym_from_list,
118 *sym_to_list; 119 *sym_to_list;
119 const char *symfs; 120 const char *symfs;
120 }; 121 };
121 122
122 extern struct symbol_conf symbol_conf; 123 extern struct symbol_conf symbol_conf;
123 extern int vmlinux_path__nr_entries; 124 extern int vmlinux_path__nr_entries;
124 extern char **vmlinux_path; 125 extern char **vmlinux_path;
125 126
126 static inline void *symbol__priv(struct symbol *sym) 127 static inline void *symbol__priv(struct symbol *sym)
127 { 128 {
128 return ((void *)sym) - symbol_conf.priv_size; 129 return ((void *)sym) - symbol_conf.priv_size;
129 } 130 }
130 131
131 struct ref_reloc_sym { 132 struct ref_reloc_sym {
132 const char *name; 133 const char *name;
133 u64 addr; 134 u64 addr;
134 u64 unrelocated_addr; 135 u64 unrelocated_addr;
135 }; 136 };
136 137
137 struct map_symbol { 138 struct map_symbol {
138 struct map *map; 139 struct map *map;
139 struct symbol *sym; 140 struct symbol *sym;
140 bool unfolded; 141 bool unfolded;
141 bool has_children; 142 bool has_children;
142 }; 143 };
143 144
144 struct addr_map_symbol { 145 struct addr_map_symbol {
145 struct map *map; 146 struct map *map;
146 struct symbol *sym; 147 struct symbol *sym;
147 u64 addr; 148 u64 addr;
148 u64 al_addr; 149 u64 al_addr;
149 }; 150 };
150 151
151 struct branch_info { 152 struct branch_info {
152 struct addr_map_symbol from; 153 struct addr_map_symbol from;
153 struct addr_map_symbol to; 154 struct addr_map_symbol to;
154 struct branch_flags flags; 155 struct branch_flags flags;
155 }; 156 };
156 157
157 struct addr_location { 158 struct addr_location {
158 struct thread *thread; 159 struct thread *thread;
159 struct map *map; 160 struct map *map;
160 struct symbol *sym; 161 struct symbol *sym;
161 u64 addr; 162 u64 addr;
162 char level; 163 char level;
163 bool filtered; 164 bool filtered;
164 u8 cpumode; 165 u8 cpumode;
165 s32 cpu; 166 s32 cpu;
166 }; 167 };
167 168
168 struct symsrc { 169 struct symsrc {
169 char *name; 170 char *name;
170 int fd; 171 int fd;
171 enum dso_binary_type type; 172 enum dso_binary_type type;
172 173
173 #ifdef LIBELF_SUPPORT 174 #ifdef LIBELF_SUPPORT
174 Elf *elf; 175 Elf *elf;
175 GElf_Ehdr ehdr; 176 GElf_Ehdr ehdr;
176 177
177 Elf_Scn *opdsec; 178 Elf_Scn *opdsec;
178 size_t opdidx; 179 size_t opdidx;
179 GElf_Shdr opdshdr; 180 GElf_Shdr opdshdr;
180 181
181 Elf_Scn *symtab; 182 Elf_Scn *symtab;
182 GElf_Shdr symshdr; 183 GElf_Shdr symshdr;
183 184
184 Elf_Scn *dynsym; 185 Elf_Scn *dynsym;
185 size_t dynsym_idx; 186 size_t dynsym_idx;
186 GElf_Shdr dynshdr; 187 GElf_Shdr dynshdr;
187 188
188 bool adjust_symbols; 189 bool adjust_symbols;
189 #endif 190 #endif
190 }; 191 };
191 192
192 void symsrc__destroy(struct symsrc *ss); 193 void symsrc__destroy(struct symsrc *ss);
193 int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name, 194 int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
194 enum dso_binary_type type); 195 enum dso_binary_type type);
195 bool symsrc__has_symtab(struct symsrc *ss); 196 bool symsrc__has_symtab(struct symsrc *ss);
196 bool symsrc__possibly_runtime(struct symsrc *ss); 197 bool symsrc__possibly_runtime(struct symsrc *ss);
197 198
198 int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter); 199 int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter);
199 int dso__load_vmlinux(struct dso *dso, struct map *map, 200 int dso__load_vmlinux(struct dso *dso, struct map *map,
200 const char *vmlinux, symbol_filter_t filter); 201 const char *vmlinux, symbol_filter_t filter);
201 int dso__load_vmlinux_path(struct dso *dso, struct map *map, 202 int dso__load_vmlinux_path(struct dso *dso, struct map *map,
202 symbol_filter_t filter); 203 symbol_filter_t filter);
203 int dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map, 204 int dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map,
204 symbol_filter_t filter); 205 symbol_filter_t filter);
205 206
206 struct symbol *dso__find_symbol(struct dso *dso, enum map_type type, 207 struct symbol *dso__find_symbol(struct dso *dso, enum map_type type,
207 u64 addr); 208 u64 addr);
208 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type, 209 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,
209 const char *name); 210 const char *name);
210 211
211 int filename__read_build_id(const char *filename, void *bf, size_t size); 212 int filename__read_build_id(const char *filename, void *bf, size_t size);
212 int sysfs__read_build_id(const char *filename, void *bf, size_t size); 213 int sysfs__read_build_id(const char *filename, void *bf, size_t size);
213 int kallsyms__parse(const char *filename, void *arg, 214 int kallsyms__parse(const char *filename, void *arg,
214 int (*process_symbol)(void *arg, const char *name, 215 int (*process_symbol)(void *arg, const char *name,
215 char type, u64 start)); 216 char type, u64 start));
216 int filename__read_debuglink(const char *filename, char *debuglink, 217 int filename__read_debuglink(const char *filename, char *debuglink,
217 size_t size); 218 size_t size);
218 219
219 int symbol__init(void); 220 int symbol__init(void);
220 void symbol__exit(void); 221 void symbol__exit(void);
221 void symbol__elf_init(void); 222 void symbol__elf_init(void);
222 struct symbol *symbol__new(u64 start, u64 len, u8 binding, const char *name); 223 struct symbol *symbol__new(u64 start, u64 len, u8 binding, const char *name);
223 size_t symbol__fprintf_symname_offs(const struct symbol *sym, 224 size_t symbol__fprintf_symname_offs(const struct symbol *sym,
224 const struct addr_location *al, FILE *fp); 225 const struct addr_location *al, FILE *fp);
225 size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp); 226 size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp);
226 size_t symbol__fprintf(struct symbol *sym, FILE *fp); 227 size_t symbol__fprintf(struct symbol *sym, FILE *fp);
227 bool symbol_type__is_a(char symbol_type, enum map_type map_type); 228 bool symbol_type__is_a(char symbol_type, enum map_type map_type);
228 bool symbol__restricted_filename(const char *filename, 229 bool symbol__restricted_filename(const char *filename,
229 const char *restricted_filename); 230 const char *restricted_filename);
230 231
231 int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss, 232 int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
232 struct symsrc *runtime_ss, symbol_filter_t filter, 233 struct symsrc *runtime_ss, symbol_filter_t filter,
233 int kmodule); 234 int kmodule);
234 int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss, 235 int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss,
235 struct map *map, symbol_filter_t filter); 236 struct map *map, symbol_filter_t filter);
236 237
237 void symbols__insert(struct rb_root *symbols, struct symbol *sym); 238 void symbols__insert(struct rb_root *symbols, struct symbol *sym);
238 void symbols__fixup_duplicate(struct rb_root *symbols); 239 void symbols__fixup_duplicate(struct rb_root *symbols);
239 void symbols__fixup_end(struct rb_root *symbols); 240 void symbols__fixup_end(struct rb_root *symbols);
240 void __map_groups__fixup_end(struct map_groups *mg, enum map_type type); 241 void __map_groups__fixup_end(struct map_groups *mg, enum map_type type);
241 242
242 #endif /* __PERF_SYMBOL */ 243 #endif /* __PERF_SYMBOL */
243 244