Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 91557e847dbc715acf2d847a1ffec63f71b00b65

Authored by Arnaldo Carvalho de Melo
1 parent 063e047761
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: Use the right symbol for annotation 

In non symbolic views, i.e. --sort without "symbol", as in:

 perf report --sort comm

We're segfaulting in the --tui because we're testing the symbol resolved
and then trying to use the symbol on the histogram entry where we're
coalescing all hits for a COMM, and the first hist_entry for a comm may
have a NULL symbol, i.e. the RIP didn't resolve to any symbol.

In this case we're segfaulting, fix it by testing against the symbol in
the histogram entry.

Reported-by: William Cohen <wcohen@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-8ylwubbcmu27ucc9ffrku3yv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

tools/perf/builtin-report.c
Diff comments   View file @ 91557e8
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 36
37 #include <linux/bitmap.h> 37 #include <linux/bitmap.h>
38 38
39 struct perf_report { 39 struct perf_report {
40 struct perf_tool tool; 40 struct perf_tool tool;
41 struct perf_session *session; 41 struct perf_session *session;
42 char const *input_name; 42 char const *input_name;
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->callchain, &parent); 73 sample->callchain, &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 > 0) { 96 if (bx->from.sym && use_browser > 0) {
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 > 0) { 110 if (bx->to.sym && use_browser > 0) {
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->callchain, &parent); 144 sample->callchain, &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 &evsel->hists.callchain_cursor, 155 &evsel->hists.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 (al->sym != NULL && use_browser > 0) { 165 if (he->ms.sym != NULL && use_browser > 0) {
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 __used, 226 struct perf_sample *sample __used,
227 struct perf_evsel *evsel, 227 struct perf_evsel *evsel,
228 struct machine *machine __used) 228 struct machine *machine __used)
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 ? event_name(evsel) : "unknown"; 233 const char *name = evsel ? event_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 ? event_name(evsel) : "FAIL", 242 evsel ? event_name(evsel) : "FAIL",
243 event->read.value); 243 event->read.value);
244 244
245 return 0; 245 return 0;
246 } 246 }
247 247
248 static int perf_report__setup_sample_type(struct perf_report *rep) 248 static int perf_report__setup_sample_type(struct perf_report *rep)
249 { 249 {
250 struct perf_session *self = rep->session; 250 struct perf_session *self = rep->session;
251 251
252 if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) { 252 if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
253 if (sort__has_parent) { 253 if (sort__has_parent) {
254 ui__error("Selected --sort parent, but no " 254 ui__error("Selected --sort parent, but no "
255 "callchain data. Did you call " 255 "callchain data. Did you call "
256 "'perf record' without -g?\n"); 256 "'perf record' without -g?\n");
257 return -EINVAL; 257 return -EINVAL;
258 } 258 }
259 if (symbol_conf.use_callchain) { 259 if (symbol_conf.use_callchain) {
260 ui__error("Selected -g but no callchain data. Did " 260 ui__error("Selected -g but no callchain data. Did "
261 "you call 'perf record' without -g?\n"); 261 "you call 'perf record' without -g?\n");
262 return -1; 262 return -1;
263 } 263 }
264 } else if (!rep->dont_use_callchains && 264 } else if (!rep->dont_use_callchains &&
265 callchain_param.mode != CHAIN_NONE && 265 callchain_param.mode != CHAIN_NONE &&
266 !symbol_conf.use_callchain) { 266 !symbol_conf.use_callchain) {
267 symbol_conf.use_callchain = true; 267 symbol_conf.use_callchain = true;
268 if (callchain_register_param(&callchain_param) < 0) { 268 if (callchain_register_param(&callchain_param) < 0) {
269 ui__error("Can't register callchain params.\n"); 269 ui__error("Can't register callchain params.\n");
270 return -EINVAL; 270 return -EINVAL;
271 } 271 }
272 } 272 }
273 273
274 if (sort__branch_mode == 1) { 274 if (sort__branch_mode == 1) {
275 if (!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) { 275 if (!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) {
276 ui__error("Selected -b but no branch data. " 276 ui__error("Selected -b but no branch data. "
277 "Did you call perf record without -b?\n"); 277 "Did you call perf record without -b?\n");
278 return -1; 278 return -1;
279 } 279 }
280 } 280 }
281 281
282 return 0; 282 return 0;
283 } 283 }
284 284
285 extern volatile int session_done; 285 extern volatile int session_done;
286 286
287 static void sig_handler(int sig __used) 287 static void sig_handler(int sig __used)
288 { 288 {
289 session_done = 1; 289 session_done = 1;
290 } 290 }
291 291
292 static size_t hists__fprintf_nr_sample_events(struct hists *self, 292 static size_t hists__fprintf_nr_sample_events(struct hists *self,
293 const char *evname, FILE *fp) 293 const char *evname, FILE *fp)
294 { 294 {
295 size_t ret; 295 size_t ret;
296 char unit; 296 char unit;
297 unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE]; 297 unsigned long nr_samples = self->stats.nr_events[PERF_RECORD_SAMPLE];
298 u64 nr_events = self->stats.total_period; 298 u64 nr_events = self->stats.total_period;
299 299
300 nr_samples = convert_unit(nr_samples, &unit); 300 nr_samples = convert_unit(nr_samples, &unit);
301 ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit); 301 ret = fprintf(fp, "# Samples: %lu%c", nr_samples, unit);
302 if (evname != NULL) 302 if (evname != NULL)
303 ret += fprintf(fp, " of event '%s'", evname); 303 ret += fprintf(fp, " of event '%s'", evname);
304 304
305 ret += fprintf(fp, "\n# Event count (approx.): %" PRIu64, nr_events); 305 ret += fprintf(fp, "\n# Event count (approx.): %" PRIu64, nr_events);
306 return ret + fprintf(fp, "\n#\n"); 306 return ret + fprintf(fp, "\n#\n");
307 } 307 }
308 308
309 static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist, 309 static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
310 struct perf_report *rep, 310 struct perf_report *rep,
311 const char *help) 311 const char *help)
312 { 312 {
313 struct perf_evsel *pos; 313 struct perf_evsel *pos;
314 314
315 list_for_each_entry(pos, &evlist->entries, node) { 315 list_for_each_entry(pos, &evlist->entries, node) {
316 struct hists *hists = &pos->hists; 316 struct hists *hists = &pos->hists;
317 const char *evname = event_name(pos); 317 const char *evname = event_name(pos);
318 318
319 hists__fprintf_nr_sample_events(hists, evname, stdout); 319 hists__fprintf_nr_sample_events(hists, evname, stdout);
320 hists__fprintf(hists, NULL, false, true, 0, 0, stdout); 320 hists__fprintf(hists, NULL, false, true, 0, 0, stdout);
321 fprintf(stdout, "\n\n"); 321 fprintf(stdout, "\n\n");
322 } 322 }
323 323
324 if (sort_order == default_sort_order && 324 if (sort_order == default_sort_order &&
325 parent_pattern == default_parent_pattern) { 325 parent_pattern == default_parent_pattern) {
326 fprintf(stdout, "#\n# (%s)\n#\n", help); 326 fprintf(stdout, "#\n# (%s)\n#\n", help);
327 327
328 if (rep->show_threads) { 328 if (rep->show_threads) {
329 bool style = !strcmp(rep->pretty_printing_style, "raw"); 329 bool style = !strcmp(rep->pretty_printing_style, "raw");
330 perf_read_values_display(stdout, &rep->show_threads_values, 330 perf_read_values_display(stdout, &rep->show_threads_values,
331 style); 331 style);
332 perf_read_values_destroy(&rep->show_threads_values); 332 perf_read_values_destroy(&rep->show_threads_values);
333 } 333 }
334 } 334 }
335 335
336 return 0; 336 return 0;
337 } 337 }
338 338
339 static int __cmd_report(struct perf_report *rep) 339 static int __cmd_report(struct perf_report *rep)
340 { 340 {
341 int ret = -EINVAL; 341 int ret = -EINVAL;
342 u64 nr_samples; 342 u64 nr_samples;
343 struct perf_session *session = rep->session; 343 struct perf_session *session = rep->session;
344 struct perf_evsel *pos; 344 struct perf_evsel *pos;
345 struct map *kernel_map; 345 struct map *kernel_map;
346 struct kmap *kernel_kmap; 346 struct kmap *kernel_kmap;
347 const char *help = "For a higher level overview, try: perf report --sort comm,dso"; 347 const char *help = "For a higher level overview, try: perf report --sort comm,dso";
348 348
349 signal(SIGINT, sig_handler); 349 signal(SIGINT, sig_handler);
350 350
351 if (rep->cpu_list) { 351 if (rep->cpu_list) {
352 ret = perf_session__cpu_bitmap(session, rep->cpu_list, 352 ret = perf_session__cpu_bitmap(session, rep->cpu_list,
353 rep->cpu_bitmap); 353 rep->cpu_bitmap);
354 if (ret) 354 if (ret)
355 goto out_delete; 355 goto out_delete;
356 } 356 }
357 357
358 if (use_browser <= 0) 358 if (use_browser <= 0)
359 perf_session__fprintf_info(session, stdout, rep->show_full_info); 359 perf_session__fprintf_info(session, stdout, rep->show_full_info);
360 360
361 if (rep->show_threads) 361 if (rep->show_threads)
362 perf_read_values_init(&rep->show_threads_values); 362 perf_read_values_init(&rep->show_threads_values);
363 363
364 ret = perf_report__setup_sample_type(rep); 364 ret = perf_report__setup_sample_type(rep);
365 if (ret) 365 if (ret)
366 goto out_delete; 366 goto out_delete;
367 367
368 ret = perf_session__process_events(session, &rep->tool); 368 ret = perf_session__process_events(session, &rep->tool);
369 if (ret) 369 if (ret)
370 goto out_delete; 370 goto out_delete;
371 371
372 kernel_map = session->host_machine.vmlinux_maps[MAP__FUNCTION]; 372 kernel_map = session->host_machine.vmlinux_maps[MAP__FUNCTION];
373 kernel_kmap = map__kmap(kernel_map); 373 kernel_kmap = map__kmap(kernel_map);
374 if (kernel_map == NULL || 374 if (kernel_map == NULL ||
375 (kernel_map->dso->hit && 375 (kernel_map->dso->hit &&
376 (kernel_kmap->ref_reloc_sym == NULL || 376 (kernel_kmap->ref_reloc_sym == NULL ||
377 kernel_kmap->ref_reloc_sym->addr == 0))) { 377 kernel_kmap->ref_reloc_sym->addr == 0))) {
378 const char *desc = 378 const char *desc =
379 "As no suitable kallsyms nor vmlinux was found, kernel samples\n" 379 "As no suitable kallsyms nor vmlinux was found, kernel samples\n"
380 "can't be resolved."; 380 "can't be resolved.";
381 381
382 if (kernel_map) { 382 if (kernel_map) {
383 const struct dso *kdso = kernel_map->dso; 383 const struct dso *kdso = kernel_map->dso;
384 if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) { 384 if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) {
385 desc = "If some relocation was applied (e.g. " 385 desc = "If some relocation was applied (e.g. "
386 "kexec) symbols may be misresolved."; 386 "kexec) symbols may be misresolved.";
387 } 387 }
388 } 388 }
389 389
390 ui__warning( 390 ui__warning(
391 "Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n" 391 "Kernel address maps (/proc/{kallsyms,modules}) were restricted.\n\n"
392 "Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n" 392 "Check /proc/sys/kernel/kptr_restrict before running 'perf record'.\n\n%s\n\n"
393 "Samples in kernel modules can't be resolved as well.\n\n", 393 "Samples in kernel modules can't be resolved as well.\n\n",
394 desc); 394 desc);
395 } 395 }
396 396
397 if (dump_trace) { 397 if (dump_trace) {
398 perf_session__fprintf_nr_events(session, stdout); 398 perf_session__fprintf_nr_events(session, stdout);
399 goto out_delete; 399 goto out_delete;
400 } 400 }
401 401
402 if (verbose > 3) 402 if (verbose > 3)
403 perf_session__fprintf(session, stdout); 403 perf_session__fprintf(session, stdout);
404 404
405 if (verbose > 2) 405 if (verbose > 2)
406 perf_session__fprintf_dsos(session, stdout); 406 perf_session__fprintf_dsos(session, stdout);
407 407
408 nr_samples = 0; 408 nr_samples = 0;
409 list_for_each_entry(pos, &session->evlist->entries, node) { 409 list_for_each_entry(pos, &session->evlist->entries, node) {
410 struct hists *hists = &pos->hists; 410 struct hists *hists = &pos->hists;
411 411
412 if (pos->idx == 0) 412 if (pos->idx == 0)
413 hists->symbol_filter_str = rep->symbol_filter_str; 413 hists->symbol_filter_str = rep->symbol_filter_str;
414 414
415 hists__collapse_resort(hists); 415 hists__collapse_resort(hists);
416 hists__output_resort(hists); 416 hists__output_resort(hists);
417 nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE]; 417 nr_samples += hists->stats.nr_events[PERF_RECORD_SAMPLE];
418 } 418 }
419 419
420 if (nr_samples == 0) { 420 if (nr_samples == 0) {
421 ui__error("The %s file has no samples!\n", session->filename); 421 ui__error("The %s file has no samples!\n", session->filename);
422 goto out_delete; 422 goto out_delete;
423 } 423 }
424 424
425 if (use_browser > 0) { 425 if (use_browser > 0) {
426 if (use_browser == 1) { 426 if (use_browser == 1) {
427 perf_evlist__tui_browse_hists(session->evlist, help, 427 perf_evlist__tui_browse_hists(session->evlist, help,
428 NULL, NULL, 0); 428 NULL, NULL, 0);
429 } else if (use_browser == 2) { 429 } else if (use_browser == 2) {
430 perf_evlist__gtk_browse_hists(session->evlist, help, 430 perf_evlist__gtk_browse_hists(session->evlist, help,
431 NULL, NULL, 0); 431 NULL, NULL, 0);
432 } 432 }
433 } else 433 } else
434 perf_evlist__tty_browse_hists(session->evlist, rep, help); 434 perf_evlist__tty_browse_hists(session->evlist, rep, help);
435 435
436 out_delete: 436 out_delete:
437 /* 437 /*
438 * Speed up the exit process, for large files this can 438 * Speed up the exit process, for large files this can
439 * take quite a while. 439 * take quite a while.
440 * 440 *
441 * XXX Enable this when using valgrind or if we ever 441 * XXX Enable this when using valgrind or if we ever
442 * librarize this command. 442 * librarize this command.
443 * 443 *
444 * Also experiment with obstacks to see how much speed 444 * Also experiment with obstacks to see how much speed
445 * up we'll get here. 445 * up we'll get here.
446 * 446 *
447 * perf_session__delete(session); 447 * perf_session__delete(session);
448 */ 448 */
449 return ret; 449 return ret;
450 } 450 }
451 451
452 static int 452 static int
453 parse_callchain_opt(const struct option *opt, const char *arg, int unset) 453 parse_callchain_opt(const struct option *opt, const char *arg, int unset)
454 { 454 {
455 struct perf_report *rep = (struct perf_report *)opt->value; 455 struct perf_report *rep = (struct perf_report *)opt->value;
456 char *tok, *tok2; 456 char *tok, *tok2;
457 char *endptr; 457 char *endptr;
458 458
459 /* 459 /*
460 * --no-call-graph 460 * --no-call-graph
461 */ 461 */
462 if (unset) { 462 if (unset) {
463 rep->dont_use_callchains = true; 463 rep->dont_use_callchains = true;
464 return 0; 464 return 0;
465 } 465 }
466 466
467 symbol_conf.use_callchain = true; 467 symbol_conf.use_callchain = true;
468 468
469 if (!arg) 469 if (!arg)
470 return 0; 470 return 0;
471 471
472 tok = strtok((char *)arg, ","); 472 tok = strtok((char *)arg, ",");
473 if (!tok) 473 if (!tok)
474 return -1; 474 return -1;
475 475
476 /* get the output mode */ 476 /* get the output mode */
477 if (!strncmp(tok, "graph", strlen(arg))) 477 if (!strncmp(tok, "graph", strlen(arg)))
478 callchain_param.mode = CHAIN_GRAPH_ABS; 478 callchain_param.mode = CHAIN_GRAPH_ABS;
479 479
480 else if (!strncmp(tok, "flat", strlen(arg))) 480 else if (!strncmp(tok, "flat", strlen(arg)))
481 callchain_param.mode = CHAIN_FLAT; 481 callchain_param.mode = CHAIN_FLAT;
482 482
483 else if (!strncmp(tok, "fractal", strlen(arg))) 483 else if (!strncmp(tok, "fractal", strlen(arg)))
484 callchain_param.mode = CHAIN_GRAPH_REL; 484 callchain_param.mode = CHAIN_GRAPH_REL;
485 485
486 else if (!strncmp(tok, "none", strlen(arg))) { 486 else if (!strncmp(tok, "none", strlen(arg))) {
487 callchain_param.mode = CHAIN_NONE; 487 callchain_param.mode = CHAIN_NONE;
488 symbol_conf.use_callchain = false; 488 symbol_conf.use_callchain = false;
489 489
490 return 0; 490 return 0;
491 } 491 }
492 492
493 else 493 else
494 return -1; 494 return -1;
495 495
496 /* get the min percentage */ 496 /* get the min percentage */
497 tok = strtok(NULL, ","); 497 tok = strtok(NULL, ",");
498 if (!tok) 498 if (!tok)
499 goto setup; 499 goto setup;
500 500
501 callchain_param.min_percent = strtod(tok, &endptr); 501 callchain_param.min_percent = strtod(tok, &endptr);
502 if (tok == endptr) 502 if (tok == endptr)
503 return -1; 503 return -1;
504 504
505 /* get the print limit */ 505 /* get the print limit */
506 tok2 = strtok(NULL, ","); 506 tok2 = strtok(NULL, ",");
507 if (!tok2) 507 if (!tok2)
508 goto setup; 508 goto setup;
509 509
510 if (tok2[0] != 'c') { 510 if (tok2[0] != 'c') {
511 callchain_param.print_limit = strtoul(tok2, &endptr, 0); 511 callchain_param.print_limit = strtoul(tok2, &endptr, 0);
512 tok2 = strtok(NULL, ","); 512 tok2 = strtok(NULL, ",");
513 if (!tok2) 513 if (!tok2)
514 goto setup; 514 goto setup;
515 } 515 }
516 516
517 /* get the call chain order */ 517 /* get the call chain order */
518 if (!strcmp(tok2, "caller")) 518 if (!strcmp(tok2, "caller"))
519 callchain_param.order = ORDER_CALLER; 519 callchain_param.order = ORDER_CALLER;
520 else if (!strcmp(tok2, "callee")) 520 else if (!strcmp(tok2, "callee"))
521 callchain_param.order = ORDER_CALLEE; 521 callchain_param.order = ORDER_CALLEE;
522 else 522 else
523 return -1; 523 return -1;
524 setup: 524 setup:
525 if (callchain_register_param(&callchain_param) < 0) { 525 if (callchain_register_param(&callchain_param) < 0) {
526 fprintf(stderr, "Can't register callchain params\n"); 526 fprintf(stderr, "Can't register callchain params\n");
527 return -1; 527 return -1;
528 } 528 }
529 return 0; 529 return 0;
530 } 530 }
531 531
532 static int 532 static int
533 parse_branch_mode(const struct option *opt __used, const char *str __used, int unset) 533 parse_branch_mode(const struct option *opt __used, const char *str __used, int unset)
534 { 534 {
535 sort__branch_mode = !unset; 535 sort__branch_mode = !unset;
536 return 0; 536 return 0;
537 } 537 }
538 538
539 int cmd_report(int argc, const char **argv, const char *prefix __used) 539 int cmd_report(int argc, const char **argv, const char *prefix __used)
540 { 540 {
541 struct perf_session *session; 541 struct perf_session *session;
542 struct stat st; 542 struct stat st;
543 bool has_br_stack = false; 543 bool has_br_stack = false;
544 int ret = -1; 544 int ret = -1;
545 char callchain_default_opt[] = "fractal,0.5,callee"; 545 char callchain_default_opt[] = "fractal,0.5,callee";
546 const char * const report_usage[] = { 546 const char * const report_usage[] = {
547 "perf report [<options>]", 547 "perf report [<options>]",
548 NULL 548 NULL
549 }; 549 };
550 struct perf_report report = { 550 struct perf_report report = {
551 .tool = { 551 .tool = {
552 .sample = process_sample_event, 552 .sample = process_sample_event,
553 .mmap = perf_event__process_mmap, 553 .mmap = perf_event__process_mmap,
554 .comm = perf_event__process_comm, 554 .comm = perf_event__process_comm,
555 .exit = perf_event__process_task, 555 .exit = perf_event__process_task,
556 .fork = perf_event__process_task, 556 .fork = perf_event__process_task,
557 .lost = perf_event__process_lost, 557 .lost = perf_event__process_lost,
558 .read = process_read_event, 558 .read = process_read_event,
559 .attr = perf_event__process_attr, 559 .attr = perf_event__process_attr,
560 .event_type = perf_event__process_event_type, 560 .event_type = perf_event__process_event_type,
561 .tracing_data = perf_event__process_tracing_data, 561 .tracing_data = perf_event__process_tracing_data,
562 .build_id = perf_event__process_build_id, 562 .build_id = perf_event__process_build_id,
563 .ordered_samples = true, 563 .ordered_samples = true,
564 .ordering_requires_timestamps = true, 564 .ordering_requires_timestamps = true,
565 }, 565 },
566 .pretty_printing_style = "normal", 566 .pretty_printing_style = "normal",
567 }; 567 };
568 const struct option options[] = { 568 const struct option options[] = {
569 OPT_STRING('i', "input", &report.input_name, "file", 569 OPT_STRING('i', "input", &report.input_name, "file",
570 "input file name"), 570 "input file name"),
571 OPT_INCR('v', "verbose", &verbose, 571 OPT_INCR('v', "verbose", &verbose,
572 "be more verbose (show symbol address, etc)"), 572 "be more verbose (show symbol address, etc)"),
573 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, 573 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
574 "dump raw trace in ASCII"), 574 "dump raw trace in ASCII"),
575 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, 575 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
576 "file", "vmlinux pathname"), 576 "file", "vmlinux pathname"),
577 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, 577 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
578 "file", "kallsyms pathname"), 578 "file", "kallsyms pathname"),
579 OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"), 579 OPT_BOOLEAN('f', "force", &report.force, "don't complain, do it"),
580 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, 580 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
581 "load module symbols - WARNING: use only with -k and LIVE kernel"), 581 "load module symbols - WARNING: use only with -k and LIVE kernel"),
582 OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples, 582 OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
583 "Show a column with the number of samples"), 583 "Show a column with the number of samples"),
584 OPT_BOOLEAN('T', "threads", &report.show_threads, 584 OPT_BOOLEAN('T', "threads", &report.show_threads,
585 "Show per-thread event counters"), 585 "Show per-thread event counters"),
586 OPT_STRING(0, "pretty", &report.pretty_printing_style, "key", 586 OPT_STRING(0, "pretty", &report.pretty_printing_style, "key",
587 "pretty printing style key: normal raw"), 587 "pretty printing style key: normal raw"),
588 OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"), 588 OPT_BOOLEAN(0, "tui", &report.use_tui, "Use the TUI interface"),
589 OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"), 589 OPT_BOOLEAN(0, "gtk", &report.use_gtk, "Use the GTK2 interface"),
590 OPT_BOOLEAN(0, "stdio", &report.use_stdio, 590 OPT_BOOLEAN(0, "stdio", &report.use_stdio,
591 "Use the stdio interface"), 591 "Use the stdio interface"),
592 OPT_STRING('s', "sort", &sort_order, "key[,key2...]", 592 OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
593 "sort by key(s): pid, comm, dso, symbol, parent, dso_to," 593 "sort by key(s): pid, comm, dso, symbol, parent, dso_to,"
594 " dso_from, symbol_to, symbol_from, mispredict"), 594 " dso_from, symbol_to, symbol_from, mispredict"),
595 OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization, 595 OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
596 "Show sample percentage for different cpu modes"), 596 "Show sample percentage for different cpu modes"),
597 OPT_STRING('p', "parent", &parent_pattern, "regex", 597 OPT_STRING('p', "parent", &parent_pattern, "regex",
598 "regex filter to identify parent, see: '--sort parent'"), 598 "regex filter to identify parent, see: '--sort parent'"),
599 OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other, 599 OPT_BOOLEAN('x', "exclude-other", &symbol_conf.exclude_other,
600 "Only display entries with parent-match"), 600 "Only display entries with parent-match"),
601 OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order", 601 OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",
602 "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. " 602 "Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit and callchain order. "
603 "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt), 603 "Default: fractal,0.5,callee", &parse_callchain_opt, callchain_default_opt),
604 OPT_BOOLEAN('G', "inverted", &report.inverted_callchain, 604 OPT_BOOLEAN('G', "inverted", &report.inverted_callchain,
605 "alias for inverted call graph"), 605 "alias for inverted call graph"),
606 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", 606 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
607 "only consider symbols in these dsos"), 607 "only consider symbols in these dsos"),
608 OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]", 608 OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
609 "only consider symbols in these comms"), 609 "only consider symbols in these comms"),
610 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", 610 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
611 "only consider these symbols"), 611 "only consider these symbols"),
612 OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter", 612 OPT_STRING(0, "symbol-filter", &report.symbol_filter_str, "filter",
613 "only show symbols that (partially) match with this filter"), 613 "only show symbols that (partially) match with this filter"),
614 OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str, 614 OPT_STRING('w', "column-widths", &symbol_conf.col_width_list_str,
615 "width[,width...]", 615 "width[,width...]",
616 "don't try to adjust column width, use these fixed values"), 616 "don't try to adjust column width, use these fixed values"),
617 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", 617 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
618 "separator for columns, no spaces will be added between " 618 "separator for columns, no spaces will be added between "
619 "columns '.' is reserved."), 619 "columns '.' is reserved."),
620 OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved, 620 OPT_BOOLEAN('U', "hide-unresolved", &report.hide_unresolved,
621 "Only display entries resolved to a symbol"), 621 "Only display entries resolved to a symbol"),
622 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", 622 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
623 "Look for files with symbols relative to this directory"), 623 "Look for files with symbols relative to this directory"),
624 OPT_STRING('C', "cpu", &report.cpu_list, "cpu", 624 OPT_STRING('C', "cpu", &report.cpu_list, "cpu",
625 "list of cpus to profile"), 625 "list of cpus to profile"),
626 OPT_BOOLEAN('I', "show-info", &report.show_full_info, 626 OPT_BOOLEAN('I', "show-info", &report.show_full_info,
627 "Display extended information about perf.data file"), 627 "Display extended information about perf.data file"),
628 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src, 628 OPT_BOOLEAN(0, "source", &symbol_conf.annotate_src,
629 "Interleave source code with assembly code (default)"), 629 "Interleave source code with assembly code (default)"),
630 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw, 630 OPT_BOOLEAN(0, "asm-raw", &symbol_conf.annotate_asm_raw,
631 "Display raw encoding of assembly instructions (default)"), 631 "Display raw encoding of assembly instructions (default)"),
632 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style", 632 OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
633 "Specify disassembler style (e.g. -M intel for intel syntax)"), 633 "Specify disassembler style (e.g. -M intel for intel syntax)"),
634 OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period, 634 OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
635 "Show a column with the sum of periods"), 635 "Show a column with the sum of periods"),
636 OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "", 636 OPT_CALLBACK_NOOPT('b', "branch-stack", &sort__branch_mode, "",
637 "use branch records for histogram filling", parse_branch_mode), 637 "use branch records for histogram filling", parse_branch_mode),
638 OPT_END() 638 OPT_END()
639 }; 639 };
640 640
641 argc = parse_options(argc, argv, options, report_usage, 0); 641 argc = parse_options(argc, argv, options, report_usage, 0);
642 642
643 if (report.use_stdio) 643 if (report.use_stdio)
644 use_browser = 0; 644 use_browser = 0;
645 else if (report.use_tui) 645 else if (report.use_tui)
646 use_browser = 1; 646 use_browser = 1;
647 else if (report.use_gtk) 647 else if (report.use_gtk)
648 use_browser = 2; 648 use_browser = 2;
649 649
650 if (report.inverted_callchain) 650 if (report.inverted_callchain)
651 callchain_param.order = ORDER_CALLER; 651 callchain_param.order = ORDER_CALLER;
652 652
653 if (!report.input_name || !strlen(report.input_name)) { 653 if (!report.input_name || !strlen(report.input_name)) {
654 if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode)) 654 if (!fstat(STDIN_FILENO, &st) && S_ISFIFO(st.st_mode))
655 report.input_name = "-"; 655 report.input_name = "-";
656 else 656 else
657 report.input_name = "perf.data"; 657 report.input_name = "perf.data";
658 } 658 }
659 session = perf_session__new(report.input_name, O_RDONLY, 659 session = perf_session__new(report.input_name, O_RDONLY,
660 report.force, false, &report.tool); 660 report.force, false, &report.tool);
661 if (session == NULL) 661 if (session == NULL)
662 return -ENOMEM; 662 return -ENOMEM;
663 663
664 report.session = session; 664 report.session = session;
665 665
666 has_br_stack = perf_header__has_feat(&session->header, 666 has_br_stack = perf_header__has_feat(&session->header,
667 HEADER_BRANCH_STACK); 667 HEADER_BRANCH_STACK);
668 668
669 if (sort__branch_mode == -1 && has_br_stack) 669 if (sort__branch_mode == -1 && has_br_stack)
670 sort__branch_mode = 1; 670 sort__branch_mode = 1;
671 671
672 /* sort__branch_mode could be 0 if --no-branch-stack */ 672 /* sort__branch_mode could be 0 if --no-branch-stack */
673 if (sort__branch_mode == 1) { 673 if (sort__branch_mode == 1) {
674 /* 674 /*
675 * if no sort_order is provided, then specify 675 * if no sort_order is provided, then specify
676 * branch-mode specific order 676 * branch-mode specific order
677 */ 677 */
678 if (sort_order == default_sort_order) 678 if (sort_order == default_sort_order)
679 sort_order = "comm,dso_from,symbol_from," 679 sort_order = "comm,dso_from,symbol_from,"
680 "dso_to,symbol_to"; 680 "dso_to,symbol_to";
681 681
682 } 682 }
683 683
684 if (strcmp(report.input_name, "-") != 0) 684 if (strcmp(report.input_name, "-") != 0)
685 setup_browser(true); 685 setup_browser(true);
686 else 686 else
687 use_browser = 0; 687 use_browser = 0;
688 688
689 /* 689 /*
690 * Only in the newt browser we are doing integrated annotation, 690 * Only in the newt browser we are doing integrated annotation,
691 * so don't allocate extra space that won't be used in the stdio 691 * so don't allocate extra space that won't be used in the stdio
692 * implementation. 692 * implementation.
693 */ 693 */
694 if (use_browser > 0) { 694 if (use_browser > 0) {
695 symbol_conf.priv_size = sizeof(struct annotation); 695 symbol_conf.priv_size = sizeof(struct annotation);
696 report.annotate_init = symbol__annotate_init; 696 report.annotate_init = symbol__annotate_init;
697 /* 697 /*
698 * For searching by name on the "Browse map details". 698 * For searching by name on the "Browse map details".
699 * providing it only in verbose mode not to bloat too 699 * providing it only in verbose mode not to bloat too
700 * much struct symbol. 700 * much struct symbol.
701 */ 701 */
702 if (verbose) { 702 if (verbose) {
703 /* 703 /*
704 * XXX: Need to provide a less kludgy way to ask for 704 * XXX: Need to provide a less kludgy way to ask for
705 * more space per symbol, the u32 is for the index on 705 * more space per symbol, the u32 is for the index on
706 * the ui browser. 706 * the ui browser.
707 * See symbol__browser_index. 707 * See symbol__browser_index.
708 */ 708 */
709 symbol_conf.priv_size += sizeof(u32); 709 symbol_conf.priv_size += sizeof(u32);
710 symbol_conf.sort_by_name = true; 710 symbol_conf.sort_by_name = true;
711 } 711 }
712 } 712 }
713 713
714 if (symbol__init() < 0) 714 if (symbol__init() < 0)
715 goto error; 715 goto error;
716 716
717 setup_sorting(report_usage, options); 717 setup_sorting(report_usage, options);
718 718
719 if (parent_pattern != default_parent_pattern) { 719 if (parent_pattern != default_parent_pattern) {
720 if (sort_dimension__add("parent") < 0) 720 if (sort_dimension__add("parent") < 0)
721 goto error; 721 goto error;
722 722
723 /* 723 /*
724 * Only show the parent fields if we explicitly 724 * Only show the parent fields if we explicitly
725 * sort that way. If we only use parent machinery 725 * sort that way. If we only use parent machinery
726 * for filtering, we don't want it. 726 * for filtering, we don't want it.
727 */ 727 */
728 if (!strstr(sort_order, "parent")) 728 if (!strstr(sort_order, "parent"))
729 sort_parent.elide = 1; 729 sort_parent.elide = 1;
730 } else 730 } else
731 symbol_conf.exclude_other = false; 731 symbol_conf.exclude_other = false;
732 732
733 if (argc) { 733 if (argc) {
734 /* 734 /*
735 * Special case: if there's an argument left then assume that 735 * Special case: if there's an argument left then assume that
736 * it's a symbol filter: 736 * it's a symbol filter:
737 */ 737 */
738 if (argc > 1) 738 if (argc > 1)
739 usage_with_options(report_usage, options); 739 usage_with_options(report_usage, options);
740 740
741 report.symbol_filter_str = argv[0]; 741 report.symbol_filter_str = argv[0];
742 } 742 }
743 743
744 sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout); 744 sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", stdout);
745 745
746 if (sort__branch_mode == 1) { 746 if (sort__branch_mode == 1) {
747 sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout); 747 sort_entry__setup_elide(&sort_dso_from, symbol_conf.dso_from_list, "dso_from", stdout);
748 sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout); 748 sort_entry__setup_elide(&sort_dso_to, symbol_conf.dso_to_list, "dso_to", stdout);
749 sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout); 749 sort_entry__setup_elide(&sort_sym_from, symbol_conf.sym_from_list, "sym_from", stdout);
750 sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout); 750 sort_entry__setup_elide(&sort_sym_to, symbol_conf.sym_to_list, "sym_to", stdout);
751 } else { 751 } else {
752 sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout); 752 sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", stdout);
753 sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout); 753 sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", stdout);
754 } 754 }
755 755
756 ret = __cmd_report(&report); 756 ret = __cmd_report(&report);
757 error: 757 error:
758 perf_session__delete(session); 758 perf_session__delete(session);
759 return ret; 759 return ret;
760 } 760 }
761 761