diff options
Diffstat (limited to 'tools/perf/builtin-annotate.c')
| -rw-r--r-- | tools/perf/builtin-annotate.c | 885 |
1 files changed, 154 insertions, 731 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 043d85b7e254..0bf2e8f9af57 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c | |||
| @@ -19,29 +19,26 @@ | |||
| 19 | #include "perf.h" | 19 | #include "perf.h" |
| 20 | #include "util/debug.h" | 20 | #include "util/debug.h" |
| 21 | 21 | ||
| 22 | #include "util/event.h" | ||
| 22 | #include "util/parse-options.h" | 23 | #include "util/parse-options.h" |
| 23 | #include "util/parse-events.h" | 24 | #include "util/parse-events.h" |
| 24 | #include "util/thread.h" | 25 | #include "util/thread.h" |
| 26 | #include "util/sort.h" | ||
| 27 | #include "util/hist.h" | ||
| 28 | #include "util/data_map.h" | ||
| 25 | 29 | ||
| 26 | static char const *input_name = "perf.data"; | 30 | static char const *input_name = "perf.data"; |
| 27 | 31 | ||
| 28 | static char default_sort_order[] = "comm,symbol"; | ||
| 29 | static char *sort_order = default_sort_order; | ||
| 30 | |||
| 31 | static int force; | 32 | static int force; |
| 32 | static int input; | ||
| 33 | static int show_mask = SHOW_KERNEL | SHOW_USER | SHOW_HV; | ||
| 34 | 33 | ||
| 35 | static int full_paths; | 34 | static int full_paths; |
| 36 | 35 | ||
| 37 | static int print_line; | 36 | static int print_line; |
| 38 | 37 | ||
| 39 | static unsigned long page_size; | 38 | struct sym_hist { |
| 40 | static unsigned long mmap_window = 32; | 39 | u64 sum; |
| 41 | 40 | u64 ip[0]; | |
| 42 | static struct rb_root threads; | 41 | }; |
| 43 | static struct thread *last_match; | ||
| 44 | |||
| 45 | 42 | ||
| 46 | struct sym_ext { | 43 | struct sym_ext { |
| 47 | struct rb_node node; | 44 | struct rb_node node; |
| @@ -49,247 +46,38 @@ struct sym_ext { | |||
| 49 | char *path; | 46 | char *path; |
| 50 | }; | 47 | }; |
| 51 | 48 | ||
| 52 | /* | 49 | struct sym_priv { |
| 53 | * histogram, sorted on item, collects counts | 50 | struct sym_hist *hist; |
| 54 | */ | 51 | struct sym_ext *ext; |
| 55 | |||
| 56 | static struct rb_root hist; | ||
| 57 | |||
| 58 | struct hist_entry { | ||
| 59 | struct rb_node rb_node; | ||
| 60 | |||
| 61 | struct thread *thread; | ||
| 62 | struct map *map; | ||
| 63 | struct dso *dso; | ||
| 64 | struct symbol *sym; | ||
| 65 | u64 ip; | ||
| 66 | char level; | ||
| 67 | |||
| 68 | uint32_t count; | ||
| 69 | }; | ||
| 70 | |||
| 71 | /* | ||
| 72 | * configurable sorting bits | ||
| 73 | */ | ||
| 74 | |||
| 75 | struct sort_entry { | ||
| 76 | struct list_head list; | ||
| 77 | |||
| 78 | const char *header; | ||
| 79 | |||
| 80 | int64_t (*cmp)(struct hist_entry *, struct hist_entry *); | ||
| 81 | int64_t (*collapse)(struct hist_entry *, struct hist_entry *); | ||
| 82 | size_t (*print)(FILE *fp, struct hist_entry *); | ||
| 83 | }; | ||
| 84 | |||
| 85 | /* --sort pid */ | ||
| 86 | |||
| 87 | static int64_t | ||
| 88 | sort__thread_cmp(struct hist_entry *left, struct hist_entry *right) | ||
| 89 | { | ||
| 90 | return right->thread->pid - left->thread->pid; | ||
| 91 | } | ||
| 92 | |||
| 93 | static size_t | ||
| 94 | sort__thread_print(FILE *fp, struct hist_entry *self) | ||
| 95 | { | ||
| 96 | return fprintf(fp, "%16s:%5d", self->thread->comm ?: "", self->thread->pid); | ||
| 97 | } | ||
| 98 | |||
| 99 | static struct sort_entry sort_thread = { | ||
| 100 | .header = " Command: Pid", | ||
| 101 | .cmp = sort__thread_cmp, | ||
| 102 | .print = sort__thread_print, | ||
| 103 | }; | ||
| 104 | |||
| 105 | /* --sort comm */ | ||
| 106 | |||
| 107 | static int64_t | ||
| 108 | sort__comm_cmp(struct hist_entry *left, struct hist_entry *right) | ||
| 109 | { | ||
| 110 | return right->thread->pid - left->thread->pid; | ||
| 111 | } | ||
| 112 | |||
| 113 | static int64_t | ||
| 114 | sort__comm_collapse(struct hist_entry *left, struct hist_entry *right) | ||
| 115 | { | ||
| 116 | char *comm_l = left->thread->comm; | ||
| 117 | char *comm_r = right->thread->comm; | ||
| 118 | |||
| 119 | if (!comm_l || !comm_r) { | ||
| 120 | if (!comm_l && !comm_r) | ||
| 121 | return 0; | ||
| 122 | else if (!comm_l) | ||
| 123 | return -1; | ||
| 124 | else | ||
| 125 | return 1; | ||
| 126 | } | ||
| 127 | |||
| 128 | return strcmp(comm_l, comm_r); | ||
| 129 | } | ||
| 130 | |||
| 131 | static size_t | ||
| 132 | sort__comm_print(FILE *fp, struct hist_entry *self) | ||
| 133 | { | ||
| 134 | return fprintf(fp, "%16s", self->thread->comm); | ||
| 135 | } | ||
| 136 | |||
| 137 | static struct sort_entry sort_comm = { | ||
| 138 | .header = " Command", | ||
| 139 | .cmp = sort__comm_cmp, | ||
| 140 | .collapse = sort__comm_collapse, | ||
| 141 | .print = sort__comm_print, | ||
| 142 | }; | ||
| 143 | |||
| 144 | /* --sort dso */ | ||
| 145 | |||
| 146 | static int64_t | ||
| 147 | sort__dso_cmp(struct hist_entry *left, struct hist_entry *right) | ||
| 148 | { | ||
| 149 | struct dso *dso_l = left->dso; | ||
| 150 | struct dso *dso_r = right->dso; | ||
| 151 | |||
| 152 | if (!dso_l || !dso_r) { | ||
| 153 | if (!dso_l && !dso_r) | ||
| 154 | return 0; | ||
| 155 | else if (!dso_l) | ||
| 156 | return -1; | ||
| 157 | else | ||
| 158 | return 1; | ||
| 159 | } | ||
| 160 | |||
| 161 | return strcmp(dso_l->name, dso_r->name); | ||
| 162 | } | ||
| 163 | |||
| 164 | static size_t | ||
| 165 | sort__dso_print(FILE *fp, struct hist_entry *self) | ||
| 166 | { | ||
| 167 | if (self->dso) | ||
| 168 | return fprintf(fp, "%-25s", self->dso->name); | ||
| 169 | |||
| 170 | return fprintf(fp, "%016llx ", (u64)self->ip); | ||
| 171 | } | ||
| 172 | |||
| 173 | static struct sort_entry sort_dso = { | ||
| 174 | .header = "Shared Object ", | ||
| 175 | .cmp = sort__dso_cmp, | ||
| 176 | .print = sort__dso_print, | ||
| 177 | }; | ||
| 178 | |||
| 179 | /* --sort symbol */ | ||
| 180 | |||
| 181 | static int64_t | ||
| 182 | sort__sym_cmp(struct hist_entry *left, struct hist_entry *right) | ||
| 183 | { | ||
| 184 | u64 ip_l, ip_r; | ||
| 185 | |||
| 186 | if (left->sym == right->sym) | ||
| 187 | return 0; | ||
| 188 | |||
| 189 | ip_l = left->sym ? left->sym->start : left->ip; | ||
| 190 | ip_r = right->sym ? right->sym->start : right->ip; | ||
| 191 | |||
| 192 | return (int64_t)(ip_r - ip_l); | ||
| 193 | } | ||
| 194 | |||
| 195 | static size_t | ||
| 196 | sort__sym_print(FILE *fp, struct hist_entry *self) | ||
| 197 | { | ||
| 198 | size_t ret = 0; | ||
| 199 | |||
| 200 | if (verbose) | ||
| 201 | ret += fprintf(fp, "%#018llx ", (u64)self->ip); | ||
| 202 | |||
| 203 | if (self->sym) { | ||
| 204 | ret += fprintf(fp, "[%c] %s", | ||
| 205 | self->dso == kernel_dso ? 'k' : '.', self->sym->name); | ||
| 206 | } else { | ||
| 207 | ret += fprintf(fp, "%#016llx", (u64)self->ip); | ||
| 208 | } | ||
| 209 | |||
| 210 | return ret; | ||
| 211 | } | ||
| 212 | |||
| 213 | static struct sort_entry sort_sym = { | ||
| 214 | .header = "Symbol", | ||
| 215 | .cmp = sort__sym_cmp, | ||
| 216 | .print = sort__sym_print, | ||
| 217 | }; | ||
| 218 | |||
| 219 | static int sort__need_collapse = 0; | ||
| 220 | |||
| 221 | struct sort_dimension { | ||
| 222 | const char *name; | ||
| 223 | struct sort_entry *entry; | ||
| 224 | int taken; | ||
| 225 | }; | 52 | }; |
| 226 | 53 | ||
| 227 | static struct sort_dimension sort_dimensions[] = { | 54 | static struct symbol_conf symbol_conf = { |
| 228 | { .name = "pid", .entry = &sort_thread, }, | 55 | .priv_size = sizeof(struct sym_priv), |
| 229 | { .name = "comm", .entry = &sort_comm, }, | 56 | .try_vmlinux_path = true, |
| 230 | { .name = "dso", .entry = &sort_dso, }, | ||
| 231 | { .name = "symbol", .entry = &sort_sym, }, | ||
| 232 | }; | 57 | }; |
| 233 | 58 | ||
| 234 | static LIST_HEAD(hist_entry__sort_list); | 59 | static const char *sym_hist_filter; |
| 235 | 60 | ||
| 236 | static int sort_dimension__add(char *tok) | 61 | static int symbol_filter(struct map *map __used, struct symbol *sym) |
| 237 | { | 62 | { |
| 238 | unsigned int i; | 63 | if (sym_hist_filter == NULL || |
| 239 | 64 | strcmp(sym->name, sym_hist_filter) == 0) { | |
| 240 | for (i = 0; i < ARRAY_SIZE(sort_dimensions); i++) { | 65 | struct sym_priv *priv = symbol__priv(sym); |
| 241 | struct sort_dimension *sd = &sort_dimensions[i]; | 66 | const int size = (sizeof(*priv->hist) + |
| 242 | 67 | (sym->end - sym->start) * sizeof(u64)); | |
| 243 | if (sd->taken) | ||
| 244 | continue; | ||
| 245 | |||
| 246 | if (strncasecmp(tok, sd->name, strlen(tok))) | ||
| 247 | continue; | ||
| 248 | |||
| 249 | if (sd->entry->collapse) | ||
| 250 | sort__need_collapse = 1; | ||
| 251 | |||
| 252 | list_add_tail(&sd->entry->list, &hist_entry__sort_list); | ||
| 253 | sd->taken = 1; | ||
| 254 | 68 | ||
| 69 | priv->hist = malloc(size); | ||
| 70 | if (priv->hist) | ||
| 71 | memset(priv->hist, 0, size); | ||
| 255 | return 0; | 72 | return 0; |
| 256 | } | 73 | } |
| 257 | 74 | /* | |
| 258 | return -ESRCH; | 75 | * FIXME: We should really filter it out, as we don't want to go thru symbols |
| 259 | } | 76 | * we're not interested, and if a DSO ends up with no symbols, delete it too, |
| 260 | 77 | * but right now the kernel loading routines in symbol.c bail out if no symbols | |
| 261 | static int64_t | 78 | * are found, fix it later. |
| 262 | hist_entry__cmp(struct hist_entry *left, struct hist_entry *right) | 79 | */ |
| 263 | { | 80 | return 0; |
| 264 | struct sort_entry *se; | ||
| 265 | int64_t cmp = 0; | ||
| 266 | |||
| 267 | list_for_each_entry(se, &hist_entry__sort_list, list) { | ||
| 268 | cmp = se->cmp(left, right); | ||
| 269 | if (cmp) | ||
| 270 | break; | ||
| 271 | } | ||
| 272 | |||
| 273 | return cmp; | ||
| 274 | } | ||
| 275 | |||
| 276 | static int64_t | ||
| 277 | hist_entry__collapse(struct hist_entry *left, struct hist_entry *right) | ||
| 278 | { | ||
| 279 | struct sort_entry *se; | ||
| 280 | int64_t cmp = 0; | ||
| 281 | |||
| 282 | list_for_each_entry(se, &hist_entry__sort_list, list) { | ||
| 283 | int64_t (*f)(struct hist_entry *, struct hist_entry *); | ||
| 284 | |||
| 285 | f = se->collapse ?: se->cmp; | ||
| 286 | |||
| 287 | cmp = f(left, right); | ||
| 288 | if (cmp) | ||
| 289 | break; | ||
| 290 | } | ||
| 291 | |||
| 292 | return cmp; | ||
| 293 | } | 81 | } |
| 294 | 82 | ||
| 295 | /* | 83 | /* |
| @@ -299,380 +87,81 @@ static void hist_hit(struct hist_entry *he, u64 ip) | |||
| 299 | { | 87 | { |
| 300 | unsigned int sym_size, offset; | 88 | unsigned int sym_size, offset; |
| 301 | struct symbol *sym = he->sym; | 89 | struct symbol *sym = he->sym; |
| 90 | struct sym_priv *priv; | ||
| 91 | struct sym_hist *h; | ||
| 302 | 92 | ||
| 303 | he->count++; | 93 | he->count++; |
| 304 | 94 | ||
| 305 | if (!sym || !sym->hist) | 95 | if (!sym || !he->map) |
| 96 | return; | ||
| 97 | |||
| 98 | priv = symbol__priv(sym); | ||
| 99 | if (!priv->hist) | ||
| 306 | return; | 100 | return; |
| 307 | 101 | ||
| 308 | sym_size = sym->end - sym->start; | 102 | sym_size = sym->end - sym->start; |
| 309 | offset = ip - sym->start; | 103 | offset = ip - sym->start; |
| 310 | 104 | ||
| 105 | if (verbose) | ||
| 106 | fprintf(stderr, "%s: ip=%Lx\n", __func__, | ||
| 107 | he->map->unmap_ip(he->map, ip)); | ||
| 108 | |||
| 311 | if (offset >= sym_size) | 109 | if (offset >= sym_size) |
| 312 | return; | 110 | return; |
| 313 | 111 | ||
| 314 | sym->hist_sum++; | 112 | h = priv->hist; |
| 315 | sym->hist[offset]++; | 113 | h->sum++; |
| 114 | h->ip[offset]++; | ||
| 316 | 115 | ||
| 317 | if (verbose >= 3) | 116 | if (verbose >= 3) |
| 318 | printf("%p %s: count++ [ip: %p, %08Lx] => %Ld\n", | 117 | printf("%p %s: count++ [ip: %p, %08Lx] => %Ld\n", |
| 319 | (void *)(unsigned long)he->sym->start, | 118 | (void *)(unsigned long)he->sym->start, |
| 320 | he->sym->name, | 119 | he->sym->name, |
| 321 | (void *)(unsigned long)ip, ip - he->sym->start, | 120 | (void *)(unsigned long)ip, ip - he->sym->start, |
| 322 | sym->hist[offset]); | 121 | h->ip[offset]); |
| 323 | } | 122 | } |
| 324 | 123 | ||
| 325 | static int | 124 | static int hist_entry__add(struct addr_location *al, u64 count) |
| 326 | hist_entry__add(struct thread *thread, struct map *map, struct dso *dso, | ||
| 327 | struct symbol *sym, u64 ip, char level) | ||
| 328 | { | 125 | { |
| 329 | struct rb_node **p = &hist.rb_node; | 126 | bool hit; |
| 330 | struct rb_node *parent = NULL; | 127 | struct hist_entry *he = __hist_entry__add(al, NULL, count, &hit); |
| 331 | struct hist_entry *he; | 128 | if (he == NULL) |
| 332 | struct hist_entry entry = { | ||
| 333 | .thread = thread, | ||
| 334 | .map = map, | ||
| 335 | .dso = dso, | ||
| 336 | .sym = sym, | ||
| 337 | .ip = ip, | ||
| 338 | .level = level, | ||
| 339 | .count = 1, | ||
| 340 | }; | ||
| 341 | int cmp; | ||
| 342 | |||
| 343 | while (*p != NULL) { | ||
| 344 | parent = *p; | ||
| 345 | he = rb_entry(parent, struct hist_entry, rb_node); | ||
| 346 | |||
| 347 | cmp = hist_entry__cmp(&entry, he); | ||
| 348 | |||
| 349 | if (!cmp) { | ||
| 350 | hist_hit(he, ip); | ||
| 351 | |||
| 352 | return 0; | ||
| 353 | } | ||
| 354 | |||
| 355 | if (cmp < 0) | ||
| 356 | p = &(*p)->rb_left; | ||
| 357 | else | ||
| 358 | p = &(*p)->rb_right; | ||
| 359 | } | ||
| 360 | |||
| 361 | he = malloc(sizeof(*he)); | ||
| 362 | if (!he) | ||
| 363 | return -ENOMEM; | 129 | return -ENOMEM; |
| 364 | *he = entry; | 130 | hist_hit(he, al->addr); |
| 365 | rb_link_node(&he->rb_node, parent, p); | ||
| 366 | rb_insert_color(&he->rb_node, &hist); | ||
| 367 | |||
| 368 | return 0; | 131 | return 0; |
| 369 | } | 132 | } |
| 370 | 133 | ||
| 371 | static void hist_entry__free(struct hist_entry *he) | 134 | static int process_sample_event(event_t *event) |
| 372 | { | ||
| 373 | free(he); | ||
| 374 | } | ||
| 375 | |||
| 376 | /* | ||
| 377 | * collapse the histogram | ||
| 378 | */ | ||
| 379 | |||
| 380 | static struct rb_root collapse_hists; | ||
| 381 | |||
| 382 | static void collapse__insert_entry(struct hist_entry *he) | ||
| 383 | { | ||
| 384 | struct rb_node **p = &collapse_hists.rb_node; | ||
| 385 | struct rb_node *parent = NULL; | ||
| 386 | struct hist_entry *iter; | ||
| 387 | int64_t cmp; | ||
| 388 | |||
| 389 | while (*p != NULL) { | ||
| 390 | parent = *p; | ||
| 391 | iter = rb_entry(parent, struct hist_entry, rb_node); | ||
| 392 | |||
| 393 | cmp = hist_entry__collapse(iter, he); | ||
| 394 | |||
| 395 | if (!cmp) { | ||
| 396 | iter->count += he->count; | ||
| 397 | hist_entry__free(he); | ||
| 398 | return; | ||
| 399 | } | ||
| 400 | |||
| 401 | if (cmp < 0) | ||
| 402 | p = &(*p)->rb_left; | ||
| 403 | else | ||
| 404 | p = &(*p)->rb_right; | ||
| 405 | } | ||
| 406 | |||
| 407 | rb_link_node(&he->rb_node, parent, p); | ||
| 408 | rb_insert_color(&he->rb_node, &collapse_hists); | ||
| 409 | } | ||
| 410 | |||
| 411 | static void collapse__resort(void) | ||
| 412 | { | ||
| 413 | struct rb_node *next; | ||
| 414 | struct hist_entry *n; | ||
| 415 | |||
| 416 | if (!sort__need_collapse) | ||
| 417 | return; | ||
| 418 | |||
| 419 | next = rb_first(&hist); | ||
| 420 | while (next) { | ||
| 421 | n = rb_entry(next, struct hist_entry, rb_node); | ||
| 422 | next = rb_next(&n->rb_node); | ||
| 423 | |||
| 424 | rb_erase(&n->rb_node, &hist); | ||
| 425 | collapse__insert_entry(n); | ||
| 426 | } | ||
| 427 | } | ||
| 428 | |||
| 429 | /* | ||
| 430 | * reverse the map, sort on count. | ||
| 431 | */ | ||
| 432 | |||
| 433 | static struct rb_root output_hists; | ||
| 434 | |||
| 435 | static void output__insert_entry(struct hist_entry *he) | ||
| 436 | { | 135 | { |
| 437 | struct rb_node **p = &output_hists.rb_node; | 136 | struct addr_location al; |
| 438 | struct rb_node *parent = NULL; | ||
| 439 | struct hist_entry *iter; | ||
| 440 | 137 | ||
| 441 | while (*p != NULL) { | 138 | dump_printf("(IP, %d): %d: %p\n", event->header.misc, |
| 442 | parent = *p; | 139 | event->ip.pid, (void *)(long)event->ip.ip); |
| 443 | iter = rb_entry(parent, struct hist_entry, rb_node); | ||
| 444 | 140 | ||
| 445 | if (he->count > iter->count) | 141 | if (event__preprocess_sample(event, &al, symbol_filter) < 0) { |
| 446 | p = &(*p)->rb_left; | ||
| 447 | else | ||
| 448 | p = &(*p)->rb_right; | ||
| 449 | } | ||
| 450 | |||
| 451 | rb_link_node(&he->rb_node, parent, p); | ||
| 452 | rb_insert_color(&he->rb_node, &output_hists); | ||
| 453 | } | ||
| 454 | |||
| 455 | static void output__resort(void) | ||
| 456 | { | ||
| 457 | struct rb_node *next; | ||
| 458 | struct hist_entry *n; | ||
| 459 | struct rb_root *tree = &hist; | ||
| 460 | |||
| 461 | if (sort__need_collapse) | ||
| 462 | tree = &collapse_hists; | ||
| 463 | |||
| 464 | next = rb_first(tree); | ||
| 465 | |||
| 466 | while (next) { | ||
| 467 | n = rb_entry(next, struct hist_entry, rb_node); | ||
| 468 | next = rb_next(&n->rb_node); | ||
| 469 | |||
| 470 | rb_erase(&n->rb_node, tree); | ||
| 471 | output__insert_entry(n); | ||
| 472 | } | ||
| 473 | } | ||
| 474 | |||
| 475 | static unsigned long total = 0, | ||
| 476 | total_mmap = 0, | ||
| 477 | total_comm = 0, | ||
| 478 | total_fork = 0, | ||
| 479 | total_unknown = 0; | ||
| 480 | |||
| 481 | static int | ||
| 482 | process_sample_event(event_t *event, unsigned long offset, unsigned long head) | ||
| 483 | { | ||
| 484 | char level; | ||
| 485 | int show = 0; | ||
| 486 | struct dso *dso = NULL; | ||
| 487 | struct thread *thread; | ||
| 488 | u64 ip = event->ip.ip; | ||
| 489 | struct map *map = NULL; | ||
| 490 | |||
| 491 | thread = threads__findnew(event->ip.pid, &threads, &last_match); | ||
| 492 | |||
| 493 | dump_printf("%p [%p]: PERF_EVENT (IP, %d): %d: %p\n", | ||
| 494 | (void *)(offset + head), | ||
| 495 | (void *)(long)(event->header.size), | ||
| 496 | event->header.misc, | ||
| 497 | event->ip.pid, | ||
| 498 | (void *)(long)ip); | ||
| 499 | |||
| 500 | dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid); | ||
| 501 | |||
| 502 | if (thread == NULL) { | ||
| 503 | fprintf(stderr, "problem processing %d event, skipping it.\n", | 142 | fprintf(stderr, "problem processing %d event, skipping it.\n", |
| 504 | event->header.type); | 143 | event->header.type); |
| 505 | return -1; | 144 | return -1; |
| 506 | } | 145 | } |
| 507 | 146 | ||
| 508 | if (event->header.misc & PERF_EVENT_MISC_KERNEL) { | 147 | if (hist_entry__add(&al, 1)) { |
| 509 | show = SHOW_KERNEL; | 148 | fprintf(stderr, "problem incrementing symbol count, " |
| 510 | level = 'k'; | 149 | "skipping event\n"); |
| 511 | |||
| 512 | dso = kernel_dso; | ||
| 513 | |||
| 514 | dump_printf(" ...... dso: %s\n", dso->name); | ||
| 515 | |||
| 516 | } else if (event->header.misc & PERF_EVENT_MISC_USER) { | ||
| 517 | |||
| 518 | show = SHOW_USER; | ||
| 519 | level = '.'; | ||
| 520 | |||
| 521 | map = thread__find_map(thread, ip); | ||
| 522 | if (map != NULL) { | ||
| 523 | ip = map->map_ip(map, ip); | ||
| 524 | dso = map->dso; | ||
| 525 | } else { | ||
| 526 | /* | ||
| 527 | * If this is outside of all known maps, | ||
| 528 | * and is a negative address, try to look it | ||
| 529 | * up in the kernel dso, as it might be a | ||
| 530 | * vsyscall (which executes in user-mode): | ||
| 531 | */ | ||
| 532 | if ((long long)ip < 0) | ||
| 533 | dso = kernel_dso; | ||
| 534 | } | ||
| 535 | dump_printf(" ...... dso: %s\n", dso ? dso->name : "<not found>"); | ||
| 536 | |||
| 537 | } else { | ||
| 538 | show = SHOW_HV; | ||
| 539 | level = 'H'; | ||
| 540 | dump_printf(" ...... dso: [hypervisor]\n"); | ||
| 541 | } | ||
| 542 | |||
| 543 | if (show & show_mask) { | ||
| 544 | struct symbol *sym = NULL; | ||
| 545 | |||
| 546 | if (dso) | ||
| 547 | sym = dso->find_symbol(dso, ip); | ||
| 548 | |||
| 549 | if (hist_entry__add(thread, map, dso, sym, ip, level)) { | ||
| 550 | fprintf(stderr, | ||
| 551 | "problem incrementing symbol count, skipping event\n"); | ||
| 552 | return -1; | ||
| 553 | } | ||
| 554 | } | ||
| 555 | total++; | ||
| 556 | |||
| 557 | return 0; | ||
| 558 | } | ||
| 559 | |||
| 560 | static int | ||
| 561 | process_mmap_event(event_t *event, unsigned long offset, unsigned long head) | ||
| 562 | { | ||
| 563 | struct thread *thread; | ||
| 564 | struct map *map = map__new(&event->mmap, NULL, 0); | ||
| 565 | |||
| 566 | thread = threads__findnew(event->mmap.pid, &threads, &last_match); | ||
| 567 | |||
| 568 | dump_printf("%p [%p]: PERF_EVENT_MMAP %d: [%p(%p) @ %p]: %s\n", | ||
| 569 | (void *)(offset + head), | ||
| 570 | (void *)(long)(event->header.size), | ||
| 571 | event->mmap.pid, | ||
| 572 | (void *)(long)event->mmap.start, | ||
| 573 | (void *)(long)event->mmap.len, | ||
| 574 | (void *)(long)event->mmap.pgoff, | ||
| 575 | event->mmap.filename); | ||
| 576 | |||
| 577 | if (thread == NULL || map == NULL) { | ||
| 578 | dump_printf("problem processing PERF_EVENT_MMAP, skipping event.\n"); | ||
| 579 | return 0; | ||
| 580 | } | ||
| 581 | |||
| 582 | thread__insert_map(thread, map); | ||
| 583 | total_mmap++; | ||
| 584 | |||
| 585 | return 0; | ||
| 586 | } | ||
| 587 | |||
| 588 | static int | ||
| 589 | process_comm_event(event_t *event, unsigned long offset, unsigned long head) | ||
| 590 | { | ||
| 591 | struct thread *thread; | ||
| 592 | |||
| 593 | thread = threads__findnew(event->comm.pid, &threads, &last_match); | ||
| 594 | dump_printf("%p [%p]: PERF_EVENT_COMM: %s:%d\n", | ||
| 595 | (void *)(offset + head), | ||
| 596 | (void *)(long)(event->header.size), | ||
| 597 | event->comm.comm, event->comm.pid); | ||
| 598 | |||
| 599 | if (thread == NULL || | ||
| 600 | thread__set_comm(thread, event->comm.comm)) { | ||
| 601 | dump_printf("problem processing PERF_EVENT_COMM, skipping event.\n"); | ||
| 602 | return -1; | ||
| 603 | } | ||
| 604 | total_comm++; | ||
| 605 | |||
| 606 | return 0; | ||
| 607 | } | ||
| 608 | |||
| 609 | static int | ||
| 610 | process_fork_event(event_t *event, unsigned long offset, unsigned long head) | ||
| 611 | { | ||
| 612 | struct thread *thread; | ||
| 613 | struct thread *parent; | ||
| 614 | |||
| 615 | thread = threads__findnew(event->fork.pid, &threads, &last_match); | ||
| 616 | parent = threads__findnew(event->fork.ppid, &threads, &last_match); | ||
| 617 | dump_printf("%p [%p]: PERF_EVENT_FORK: %d:%d\n", | ||
| 618 | (void *)(offset + head), | ||
| 619 | (void *)(long)(event->header.size), | ||
| 620 | event->fork.pid, event->fork.ppid); | ||
| 621 | |||
| 622 | /* | ||
| 623 | * A thread clone will have the same PID for both | ||
| 624 | * parent and child. | ||
| 625 | */ | ||
| 626 | if (thread == parent) | ||
| 627 | return 0; | ||
| 628 | |||
| 629 | if (!thread || !parent || thread__fork(thread, parent)) { | ||
| 630 | dump_printf("problem processing PERF_EVENT_FORK, skipping event.\n"); | ||
| 631 | return -1; | ||
| 632 | } | ||
| 633 | total_fork++; | ||
| 634 | |||
| 635 | return 0; | ||
| 636 | } | ||
| 637 | |||
| 638 | static int | ||
| 639 | process_event(event_t *event, unsigned long offset, unsigned long head) | ||
| 640 | { | ||
| 641 | switch (event->header.type) { | ||
| 642 | case PERF_EVENT_SAMPLE: | ||
| 643 | return process_sample_event(event, offset, head); | ||
| 644 | |||
| 645 | case PERF_EVENT_MMAP: | ||
| 646 | return process_mmap_event(event, offset, head); | ||
| 647 | |||
| 648 | case PERF_EVENT_COMM: | ||
| 649 | return process_comm_event(event, offset, head); | ||
| 650 | |||
| 651 | case PERF_EVENT_FORK: | ||
| 652 | return process_fork_event(event, offset, head); | ||
| 653 | /* | ||
| 654 | * We dont process them right now but they are fine: | ||
| 655 | */ | ||
| 656 | |||
| 657 | case PERF_EVENT_THROTTLE: | ||
| 658 | case PERF_EVENT_UNTHROTTLE: | ||
| 659 | return 0; | ||
| 660 | |||
| 661 | default: | ||
| 662 | return -1; | 150 | return -1; |
| 663 | } | 151 | } |
| 664 | 152 | ||
| 665 | return 0; | 153 | return 0; |
| 666 | } | 154 | } |
| 667 | 155 | ||
| 668 | static int | 156 | static int parse_line(FILE *file, struct hist_entry *he, u64 len) |
| 669 | parse_line(FILE *file, struct symbol *sym, u64 start, u64 len) | ||
| 670 | { | 157 | { |
| 158 | struct symbol *sym = he->sym; | ||
| 671 | char *line = NULL, *tmp, *tmp2; | 159 | char *line = NULL, *tmp, *tmp2; |
| 672 | static const char *prev_line; | 160 | static const char *prev_line; |
| 673 | static const char *prev_color; | 161 | static const char *prev_color; |
| 674 | unsigned int offset; | 162 | unsigned int offset; |
| 675 | size_t line_len; | 163 | size_t line_len; |
| 164 | u64 start; | ||
| 676 | s64 line_ip; | 165 | s64 line_ip; |
| 677 | int ret; | 166 | int ret; |
| 678 | char *c; | 167 | char *c; |
| @@ -709,22 +198,26 @@ parse_line(FILE *file, struct symbol *sym, u64 start, u64 len) | |||
| 709 | line_ip = -1; | 198 | line_ip = -1; |
| 710 | } | 199 | } |
| 711 | 200 | ||
| 201 | start = he->map->unmap_ip(he->map, sym->start); | ||
| 202 | |||
| 712 | if (line_ip != -1) { | 203 | if (line_ip != -1) { |
| 713 | const char *path = NULL; | 204 | const char *path = NULL; |
| 714 | unsigned int hits = 0; | 205 | unsigned int hits = 0; |
| 715 | double percent = 0.0; | 206 | double percent = 0.0; |
| 716 | const char *color; | 207 | const char *color; |
| 717 | struct sym_ext *sym_ext = sym->priv; | 208 | struct sym_priv *priv = symbol__priv(sym); |
| 209 | struct sym_ext *sym_ext = priv->ext; | ||
| 210 | struct sym_hist *h = priv->hist; | ||
| 718 | 211 | ||
| 719 | offset = line_ip - start; | 212 | offset = line_ip - start; |
| 720 | if (offset < len) | 213 | if (offset < len) |
| 721 | hits = sym->hist[offset]; | 214 | hits = h->ip[offset]; |
| 722 | 215 | ||
| 723 | if (offset < len && sym_ext) { | 216 | if (offset < len && sym_ext) { |
| 724 | path = sym_ext[offset].path; | 217 | path = sym_ext[offset].path; |
| 725 | percent = sym_ext[offset].percent; | 218 | percent = sym_ext[offset].percent; |
| 726 | } else if (sym->hist_sum) | 219 | } else if (h->sum) |
| 727 | percent = 100.0 * hits / sym->hist_sum; | 220 | percent = 100.0 * hits / h->sum; |
| 728 | 221 | ||
| 729 | color = get_percent_color(percent); | 222 | color = get_percent_color(percent); |
| 730 | 223 | ||
| @@ -777,9 +270,10 @@ static void insert_source_line(struct sym_ext *sym_ext) | |||
| 777 | rb_insert_color(&sym_ext->node, &root_sym_ext); | 270 | rb_insert_color(&sym_ext->node, &root_sym_ext); |
| 778 | } | 271 | } |
| 779 | 272 | ||
| 780 | static void free_source_line(struct symbol *sym, int len) | 273 | static void free_source_line(struct hist_entry *he, int len) |
| 781 | { | 274 | { |
| 782 | struct sym_ext *sym_ext = sym->priv; | 275 | struct sym_priv *priv = symbol__priv(he->sym); |
| 276 | struct sym_ext *sym_ext = priv->ext; | ||
| 783 | int i; | 277 | int i; |
| 784 | 278 | ||
| 785 | if (!sym_ext) | 279 | if (!sym_ext) |
| @@ -789,26 +283,30 @@ static void free_source_line(struct symbol *sym, int len) | |||
| 789 | free(sym_ext[i].path); | 283 | free(sym_ext[i].path); |
| 790 | free(sym_ext); | 284 | free(sym_ext); |
| 791 | 285 | ||
| 792 | sym->priv = NULL; | 286 | priv->ext = NULL; |
| 793 | root_sym_ext = RB_ROOT; | 287 | root_sym_ext = RB_ROOT; |
| 794 | } | 288 | } |
| 795 | 289 | ||
| 796 | /* Get the filename:line for the colored entries */ | 290 | /* Get the filename:line for the colored entries */ |
| 797 | static void | 291 | static void |
| 798 | get_source_line(struct symbol *sym, u64 start, int len, const char *filename) | 292 | get_source_line(struct hist_entry *he, int len, const char *filename) |
| 799 | { | 293 | { |
| 294 | struct symbol *sym = he->sym; | ||
| 295 | u64 start; | ||
| 800 | int i; | 296 | int i; |
| 801 | char cmd[PATH_MAX * 2]; | 297 | char cmd[PATH_MAX * 2]; |
| 802 | struct sym_ext *sym_ext; | 298 | struct sym_ext *sym_ext; |
| 299 | struct sym_priv *priv = symbol__priv(sym); | ||
| 300 | struct sym_hist *h = priv->hist; | ||
| 803 | 301 | ||
| 804 | if (!sym->hist_sum) | 302 | if (!h->sum) |
| 805 | return; | 303 | return; |
| 806 | 304 | ||
| 807 | sym->priv = calloc(len, sizeof(struct sym_ext)); | 305 | sym_ext = priv->ext = calloc(len, sizeof(struct sym_ext)); |
| 808 | if (!sym->priv) | 306 | if (!priv->ext) |
| 809 | return; | 307 | return; |
| 810 | 308 | ||
| 811 | sym_ext = sym->priv; | 309 | start = he->map->unmap_ip(he->map, sym->start); |
| 812 | 310 | ||
| 813 | for (i = 0; i < len; i++) { | 311 | for (i = 0; i < len; i++) { |
| 814 | char *path = NULL; | 312 | char *path = NULL; |
| @@ -816,7 +314,7 @@ get_source_line(struct symbol *sym, u64 start, int len, const char *filename) | |||
| 816 | u64 offset; | 314 | u64 offset; |
| 817 | FILE *fp; | 315 | FILE *fp; |
| 818 | 316 | ||
| 819 | sym_ext[i].percent = 100.0 * sym->hist[i] / sym->hist_sum; | 317 | sym_ext[i].percent = 100.0 * h->ip[i] / h->sum; |
| 820 | if (sym_ext[i].percent <= 0.5) | 318 | if (sym_ext[i].percent <= 0.5) |
| 821 | continue; | 319 | continue; |
| 822 | 320 | ||
| @@ -870,33 +368,34 @@ static void print_summary(const char *filename) | |||
| 870 | } | 368 | } |
| 871 | } | 369 | } |
| 872 | 370 | ||
| 873 | static void annotate_sym(struct dso *dso, struct symbol *sym) | 371 | static void annotate_sym(struct hist_entry *he) |
| 874 | { | 372 | { |
| 875 | const char *filename = dso->name, *d_filename; | 373 | struct map *map = he->map; |
| 876 | u64 start, end, len; | 374 | struct dso *dso = map->dso; |
| 375 | struct symbol *sym = he->sym; | ||
| 376 | const char *filename = dso->long_name, *d_filename; | ||
| 377 | u64 len; | ||
| 877 | char command[PATH_MAX*2]; | 378 | char command[PATH_MAX*2]; |
| 878 | FILE *file; | 379 | FILE *file; |
| 879 | 380 | ||
| 880 | if (!filename) | 381 | if (!filename) |
| 881 | return; | 382 | return; |
| 882 | if (sym->module) | 383 | |
| 883 | filename = sym->module->path; | 384 | if (verbose) |
| 884 | else if (dso == kernel_dso) | 385 | fprintf(stderr, "%s: filename=%s, sym=%s, start=%Lx, end=%Lx\n", |
| 885 | filename = vmlinux_name; | 386 | __func__, filename, sym->name, |
| 886 | 387 | map->unmap_ip(map, sym->start), | |
| 887 | start = sym->obj_start; | 388 | map->unmap_ip(map, sym->end)); |
| 888 | if (!start) | 389 | |
| 889 | start = sym->start; | ||
| 890 | if (full_paths) | 390 | if (full_paths) |
| 891 | d_filename = filename; | 391 | d_filename = filename; |
| 892 | else | 392 | else |
| 893 | d_filename = basename(filename); | 393 | d_filename = basename(filename); |
| 894 | 394 | ||
| 895 | end = start + sym->end - sym->start + 1; | ||
| 896 | len = sym->end - sym->start; | 395 | len = sym->end - sym->start; |
| 897 | 396 | ||
| 898 | if (print_line) { | 397 | if (print_line) { |
| 899 | get_source_line(sym, start, len, filename); | 398 | get_source_line(he, len, filename); |
| 900 | print_summary(filename); | 399 | print_summary(filename); |
| 901 | } | 400 | } |
| 902 | 401 | ||
| @@ -905,10 +404,12 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) | |||
| 905 | printf("------------------------------------------------\n"); | 404 | printf("------------------------------------------------\n"); |
| 906 | 405 | ||
| 907 | if (verbose >= 2) | 406 | if (verbose >= 2) |
| 908 | printf("annotating [%p] %30s : [%p] %30s\n", dso, dso->name, sym, sym->name); | 407 | printf("annotating [%p] %30s : [%p] %30s\n", |
| 408 | dso, dso->long_name, sym, sym->name); | ||
| 909 | 409 | ||
| 910 | sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s|grep -v %s", | 410 | sprintf(command, "objdump --start-address=0x%016Lx --stop-address=0x%016Lx -dS %s|grep -v %s", |
| 911 | (u64)start, (u64)end, filename, filename); | 411 | map->unmap_ip(map, sym->start), map->unmap_ip(map, sym->end), |
| 412 | filename, filename); | ||
| 912 | 413 | ||
| 913 | if (verbose >= 3) | 414 | if (verbose >= 3) |
| 914 | printf("doing: %s\n", command); | 415 | printf("doing: %s\n", command); |
| @@ -918,159 +419,78 @@ static void annotate_sym(struct dso *dso, struct symbol *sym) | |||
| 918 | return; | 419 | return; |
| 919 | 420 | ||
| 920 | while (!feof(file)) { | 421 | while (!feof(file)) { |
| 921 | if (parse_line(file, sym, start, len) < 0) | 422 | if (parse_line(file, he, len) < 0) |
| 922 | break; | 423 | break; |
| 923 | } | 424 | } |
| 924 | 425 | ||
| 925 | pclose(file); | 426 | pclose(file); |
| 926 | if (print_line) | 427 | if (print_line) |
| 927 | free_source_line(sym, len); | 428 | free_source_line(he, len); |
| 928 | } | 429 | } |
| 929 | 430 | ||
| 930 | static void find_annotations(void) | 431 | static void find_annotations(void) |
| 931 | { | 432 | { |
| 932 | struct rb_node *nd; | 433 | struct rb_node *nd; |
| 933 | struct dso *dso; | ||
| 934 | int count = 0; | ||
| 935 | |||
| 936 | list_for_each_entry(dso, &dsos, node) { | ||
| 937 | |||
| 938 | for (nd = rb_first(&dso->syms); nd; nd = rb_next(nd)) { | ||
| 939 | struct symbol *sym = rb_entry(nd, struct symbol, rb_node); | ||
| 940 | |||
| 941 | if (sym->hist) { | ||
| 942 | annotate_sym(dso, sym); | ||
| 943 | count++; | ||
| 944 | } | ||
| 945 | } | ||
| 946 | } | ||
| 947 | |||
| 948 | if (!count) | ||
| 949 | printf(" Error: symbol '%s' not present amongst the samples.\n", sym_hist_filter); | ||
| 950 | } | ||
| 951 | |||
| 952 | static int __cmd_annotate(void) | ||
| 953 | { | ||
| 954 | int ret, rc = EXIT_FAILURE; | ||
| 955 | unsigned long offset = 0; | ||
| 956 | unsigned long head = 0; | ||
| 957 | struct stat input_stat; | ||
| 958 | event_t *event; | ||
| 959 | uint32_t size; | ||
| 960 | char *buf; | ||
| 961 | |||
| 962 | register_idle_thread(&threads, &last_match); | ||
| 963 | |||
| 964 | input = open(input_name, O_RDONLY); | ||
| 965 | if (input < 0) { | ||
| 966 | perror("failed to open file"); | ||
| 967 | exit(-1); | ||
| 968 | } | ||
| 969 | |||
| 970 | ret = fstat(input, &input_stat); | ||
| 971 | if (ret < 0) { | ||
| 972 | perror("failed to stat file"); | ||
| 973 | exit(-1); | ||
| 974 | } | ||
| 975 | |||
| 976 | if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) { | ||
| 977 | fprintf(stderr, "file: %s not owned by current user or root\n", input_name); | ||
| 978 | exit(-1); | ||
| 979 | } | ||
| 980 | |||
| 981 | if (!input_stat.st_size) { | ||
| 982 | fprintf(stderr, "zero-sized file, nothing to do!\n"); | ||
| 983 | exit(0); | ||
| 984 | } | ||
| 985 | |||
| 986 | if (load_kernel() < 0) { | ||
| 987 | perror("failed to load kernel symbols"); | ||
| 988 | return EXIT_FAILURE; | ||
| 989 | } | ||
| 990 | |||
| 991 | remap: | ||
| 992 | buf = (char *)mmap(NULL, page_size * mmap_window, PROT_READ, | ||
| 993 | MAP_SHARED, input, offset); | ||
| 994 | if (buf == MAP_FAILED) { | ||
| 995 | perror("failed to mmap file"); | ||
| 996 | exit(-1); | ||
| 997 | } | ||
| 998 | |||
| 999 | more: | ||
| 1000 | event = (event_t *)(buf + head); | ||
| 1001 | 434 | ||
| 1002 | size = event->header.size; | 435 | for (nd = rb_first(&output_hists); nd; nd = rb_next(nd)) { |
| 1003 | if (!size) | 436 | struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node); |
| 1004 | size = 8; | 437 | struct sym_priv *priv; |
| 1005 | 438 | ||
| 1006 | if (head + event->header.size >= page_size * mmap_window) { | 439 | if (he->sym == NULL) |
| 1007 | unsigned long shift = page_size * (head / page_size); | 440 | continue; |
| 1008 | int munmap_ret; | ||
| 1009 | |||
| 1010 | munmap_ret = munmap(buf, page_size * mmap_window); | ||
| 1011 | assert(munmap_ret == 0); | ||
| 1012 | |||
| 1013 | offset += shift; | ||
| 1014 | head -= shift; | ||
| 1015 | goto remap; | ||
| 1016 | } | ||
| 1017 | |||
| 1018 | size = event->header.size; | ||
| 1019 | |||
| 1020 | dump_printf("%p [%p]: event: %d\n", | ||
| 1021 | (void *)(offset + head), | ||
| 1022 | (void *)(long)event->header.size, | ||
| 1023 | event->header.type); | ||
| 1024 | |||
| 1025 | if (!size || process_event(event, offset, head) < 0) { | ||
| 1026 | |||
| 1027 | dump_printf("%p [%p]: skipping unknown header type: %d\n", | ||
| 1028 | (void *)(offset + head), | ||
| 1029 | (void *)(long)(event->header.size), | ||
| 1030 | event->header.type); | ||
| 1031 | 441 | ||
| 1032 | total_unknown++; | 442 | priv = symbol__priv(he->sym); |
| 443 | if (priv->hist == NULL) | ||
| 444 | continue; | ||
| 1033 | 445 | ||
| 446 | annotate_sym(he); | ||
| 1034 | /* | 447 | /* |
| 1035 | * assume we lost track of the stream, check alignment, and | 448 | * Since we have a hist_entry per IP for the same symbol, free |
| 1036 | * increment a single u64 in the hope to catch on again 'soon'. | 449 | * he->sym->hist to signal we already processed this symbol. |
| 1037 | */ | 450 | */ |
| 1038 | 451 | free(priv->hist); | |
| 1039 | if (unlikely(head & 7)) | 452 | priv->hist = NULL; |
| 1040 | head &= ~7ULL; | ||
| 1041 | |||
| 1042 | size = 8; | ||
| 1043 | } | 453 | } |
| 454 | } | ||
| 1044 | 455 | ||
| 1045 | head += size; | 456 | static struct perf_file_handler file_handler = { |
| 457 | .process_sample_event = process_sample_event, | ||
| 458 | .process_mmap_event = event__process_mmap, | ||
| 459 | .process_comm_event = event__process_comm, | ||
| 460 | .process_fork_event = event__process_task, | ||
| 461 | }; | ||
| 1046 | 462 | ||
| 1047 | if (offset + head < (unsigned long)input_stat.st_size) | 463 | static int __cmd_annotate(void) |
| 1048 | goto more; | 464 | { |
| 465 | struct perf_header *header; | ||
| 466 | struct thread *idle; | ||
| 467 | int ret; | ||
| 1049 | 468 | ||
| 1050 | rc = EXIT_SUCCESS; | 469 | idle = register_idle_thread(); |
| 1051 | close(input); | 470 | register_perf_file_handler(&file_handler); |
| 1052 | 471 | ||
| 1053 | dump_printf(" IP events: %10ld\n", total); | 472 | ret = mmap_dispatch_perf_file(&header, input_name, 0, 0, |
| 1054 | dump_printf(" mmap events: %10ld\n", total_mmap); | 473 | &event__cwdlen, &event__cwd); |
| 1055 | dump_printf(" comm events: %10ld\n", total_comm); | 474 | if (ret) |
| 1056 | dump_printf(" fork events: %10ld\n", total_fork); | 475 | return ret; |
| 1057 | dump_printf(" unknown events: %10ld\n", total_unknown); | ||
| 1058 | 476 | ||
| 1059 | if (dump_trace) | 477 | if (dump_trace) { |
| 478 | event__print_totals(); | ||
| 1060 | return 0; | 479 | return 0; |
| 480 | } | ||
| 1061 | 481 | ||
| 1062 | if (verbose >= 3) | 482 | if (verbose > 3) |
| 1063 | threads__fprintf(stdout, &threads); | 483 | threads__fprintf(stdout); |
| 1064 | 484 | ||
| 1065 | if (verbose >= 2) | 485 | if (verbose > 2) |
| 1066 | dsos__fprintf(stdout); | 486 | dsos__fprintf(stdout); |
| 1067 | 487 | ||
| 1068 | collapse__resort(); | 488 | collapse__resort(); |
| 1069 | output__resort(); | 489 | output__resort(event__total[0]); |
| 1070 | 490 | ||
| 1071 | find_annotations(); | 491 | find_annotations(); |
| 1072 | 492 | ||
| 1073 | return rc; | 493 | return ret; |
| 1074 | } | 494 | } |
| 1075 | 495 | ||
| 1076 | static const char * const annotate_usage[] = { | 496 | static const char * const annotate_usage[] = { |
| @@ -1088,8 +508,9 @@ static const struct option options[] = { | |||
| 1088 | "be more verbose (show symbol address, etc)"), | 508 | "be more verbose (show symbol address, etc)"), |
| 1089 | OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, | 509 | OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, |
| 1090 | "dump raw trace in ASCII"), | 510 | "dump raw trace in ASCII"), |
| 1091 | OPT_STRING('k', "vmlinux", &vmlinux_name, "file", "vmlinux pathname"), | 511 | OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, |
| 1092 | OPT_BOOLEAN('m', "modules", &modules, | 512 | "file", "vmlinux pathname"), |
| 513 | OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, | ||
| 1093 | "load module symbols - WARNING: use only with -k and LIVE kernel"), | 514 | "load module symbols - WARNING: use only with -k and LIVE kernel"), |
| 1094 | OPT_BOOLEAN('l', "print-line", &print_line, | 515 | OPT_BOOLEAN('l', "print-line", &print_line, |
| 1095 | "print matching source lines (may be slow)"), | 516 | "print matching source lines (may be slow)"), |
| @@ -1115,9 +536,8 @@ static void setup_sorting(void) | |||
| 1115 | 536 | ||
| 1116 | int cmd_annotate(int argc, const char **argv, const char *prefix __used) | 537 | int cmd_annotate(int argc, const char **argv, const char *prefix __used) |
| 1117 | { | 538 | { |
| 1118 | symbol__init(); | 539 | if (symbol__init(&symbol_conf) < 0) |
| 1119 | 540 | return -1; | |
| 1120 | page_size = getpagesize(); | ||
| 1121 | 541 | ||
| 1122 | argc = parse_options(argc, argv, options, annotate_usage, 0); | 542 | argc = parse_options(argc, argv, options, annotate_usage, 0); |
| 1123 | 543 | ||
| @@ -1134,10 +554,13 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) | |||
| 1134 | sym_hist_filter = argv[0]; | 554 | sym_hist_filter = argv[0]; |
| 1135 | } | 555 | } |
| 1136 | 556 | ||
| 1137 | if (!sym_hist_filter) | ||
| 1138 | usage_with_options(annotate_usage, options); | ||
| 1139 | |||
| 1140 | setup_pager(); | 557 | setup_pager(); |
| 1141 | 558 | ||
| 559 | if (field_sep && *field_sep == '.') { | ||
| 560 | fputs("'.' is the only non valid --field-separator argument\n", | ||
| 561 | stderr); | ||
| 562 | exit(129); | ||
| 563 | } | ||
| 564 | |||
| 1142 | return __cmd_annotate(); | 565 | return __cmd_annotate(); |
| 1143 | } | 566 | } |
