X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=tools%2Fperf%2Fbuiltin-diff.c;h=a6e2fdc7a04e16613087a4c65e70d832ab903505;hb=b2e75eff5e859d0c294e7405958362b26a423c6e;hp=0d528018ffb866aa896b066b66003556dba4ea75;hpb=86a9eee047ba09a714c3b8e27c9df2bbf715393a;p=safe%2Fjmp%2Flinux-2.6 diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 0d52801..a6e2fdc 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -16,26 +16,18 @@ #include -static char const *input_old = "perf.data.old", - *input_new = "perf.data"; -static int force; -static bool show_percent; - -struct symbol_conf symbol_conf; - -static int perf_session__add_hist_entry(struct perf_session *self, - struct addr_location *al, u64 count) +static char const *input_old = "perf.data.old", + *input_new = "perf.data"; +static char diff__default_sort_order[] = "dso,symbol"; +static bool force; +static bool show_displacement; + +static int hists__add_entry(struct hists *self, + struct addr_location *al, u64 period) { - bool hit; - struct hist_entry *he = __perf_session__add_hist_entry(self, al, NULL, - count, &hit); - if (he == NULL) - return -ENOMEM; - - if (hit) - he->count += count; - - return 0; + if (__hists__add_entry(self, al, NULL, period) != NULL) + return 0; + return -ENOMEM; } static int diff__process_sample_event(event_t *event, struct perf_session *session) @@ -43,8 +35,8 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi struct addr_location al; struct sample_data data = { .period = 1, }; - dump_printf("(IP, %d): %d: %p\n", event->header.misc, - event->ip.pid, (void *)(long)event->ip.ip); + dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc, + event->ip.pid, event->ip.ip); if (event__preprocess_sample(event, session, &al, NULL) < 0) { pr_warning("problem processing %d event, skipping it.\n", @@ -52,24 +44,27 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi return -1; } + if (al.filtered || al.sym == NULL) + return 0; + event__parse_sample(event, session->sample_type, &data); - if (al.sym && perf_session__add_hist_entry(session, &al, data.period)) { - pr_warning("problem incrementing symbol count, skipping event\n"); + if (hists__add_entry(&session->hists, &al, data.period)) { + pr_warning("problem incrementing symbol period, skipping event\n"); return -1; } - session->events_stats.total += data.period; + session->hists.stats.total_period += data.period; return 0; } static struct perf_event_ops event_ops = { - .process_sample_event = diff__process_sample_event, - .process_mmap_event = event__process_mmap, - .process_comm_event = event__process_comm, - .process_exit_event = event__process_task, - .process_fork_event = event__process_task, - .process_lost_event = event__process_lost, + .sample = diff__process_sample_event, + .mmap = event__process_mmap, + .comm = event__process_comm, + .exit = event__process_task, + .fork = event__process_task, + .lost = event__process_lost, }; static void perf_session__insert_hist_entry_by_name(struct rb_root *root, @@ -80,145 +75,70 @@ static void perf_session__insert_hist_entry_by_name(struct rb_root *root, struct hist_entry *iter; while (*p != NULL) { - int cmp; parent = *p; iter = rb_entry(parent, struct hist_entry, rb_node); - - cmp = strcmp(he->map->dso->name, iter->map->dso->name); - if (cmp > 0) + if (hist_entry__cmp(he, iter) < 0) p = &(*p)->rb_left; - else if (cmp < 0) + else p = &(*p)->rb_right; - else { - cmp = strcmp(he->sym->name, iter->sym->name); - if (cmp > 0) - p = &(*p)->rb_left; - else - p = &(*p)->rb_right; - } } rb_link_node(&he->rb_node, parent, p); rb_insert_color(&he->rb_node, root); } -static void perf_session__resort_by_name(struct perf_session *self) +static void hists__resort_entries(struct hists *self) { unsigned long position = 1; struct rb_root tmp = RB_ROOT; - struct rb_node *next = rb_first(&self->hists); + struct rb_node *next = rb_first(&self->entries); while (next != NULL) { struct hist_entry *n = rb_entry(next, struct hist_entry, rb_node); next = rb_next(&n->rb_node); - rb_erase(&n->rb_node, &self->hists); + rb_erase(&n->rb_node, &self->entries); n->position = position++; perf_session__insert_hist_entry_by_name(&tmp, n); } - self->hists = tmp; + self->entries = tmp; } -static struct hist_entry * -perf_session__find_hist_entry_by_name(struct perf_session *self, - struct hist_entry *he) +static void hists__set_positions(struct hists *self) { - struct rb_node *n = self->hists.rb_node; + hists__output_resort(self); + hists__resort_entries(self); +} + +static struct hist_entry *hists__find_entry(struct hists *self, + struct hist_entry *he) +{ + struct rb_node *n = self->entries.rb_node; while (n) { struct hist_entry *iter = rb_entry(n, struct hist_entry, rb_node); - int cmp = strcmp(he->map->dso->name, iter->map->dso->name); + int64_t cmp = hist_entry__cmp(he, iter); - if (cmp > 0) + if (cmp < 0) n = n->rb_left; - else if (cmp < 0) + else if (cmp > 0) n = n->rb_right; - else { - cmp = strcmp(he->sym->name, iter->sym->name); - if (cmp > 0) - n = n->rb_left; - else if (cmp < 0) - n = n->rb_right; - else - return iter; - } + else + return iter; } return NULL; } -static void perf_session__match_hists(struct perf_session *old_session, - struct perf_session *new_session) +static void hists__match(struct hists *older, struct hists *newer) { struct rb_node *nd; - perf_session__resort_by_name(old_session); - - for (nd = rb_first(&new_session->hists); nd; nd = rb_next(nd)) { + for (nd = rb_first(&newer->entries); nd; nd = rb_next(nd)) { struct hist_entry *pos = rb_entry(nd, struct hist_entry, rb_node); - pos->pair = perf_session__find_hist_entry_by_name(old_session, pos); - } -} - -static size_t hist_entry__fprintf_matched(struct hist_entry *self, - unsigned long pos, - struct perf_session *session, - struct perf_session *pair_session, - FILE *fp) -{ - u64 old_count = 0; - char displacement[16]; - size_t printed; - - if (self->pair != NULL) { - long pdiff = (long)self->pair->position - (long)pos; - old_count = self->pair->count; - if (pdiff == 0) - goto blank; - snprintf(displacement, sizeof(displacement), "%+4ld", pdiff); - } else { -blank: memset(displacement, ' ', sizeof(displacement)); - } - - printed = fprintf(fp, "%4lu %5.5s ", pos, displacement); - - if (show_percent) { - double old_percent = (old_count * 100) / pair_session->events_stats.total, - new_percent = (self->count * 100) / session->events_stats.total; - double diff = old_percent - new_percent; - - if (verbose) - printed += fprintf(fp, " %3.2f%% %3.2f%%", old_percent, new_percent); - - if ((u64)diff != 0) - printed += fprintf(fp, " %+4.2F%%", diff); - else - printed += fprintf(fp, " "); - } else { - if (verbose) - printed += fprintf(fp, " %9Lu %9Lu", old_count, self->count); - printed += fprintf(fp, " %+9Ld", (s64)self->count - (s64)old_count); + pos->pair = hists__find_entry(older, pos); } - - return printed + fprintf(fp, " %25.25s %s\n", - self->map->dso->name, self->sym->name); -} - -static size_t perf_session__fprintf_matched_hists(struct perf_session *self, - struct perf_session *pair, - FILE *fp) -{ - struct rb_node *nd; - size_t printed = 0; - unsigned long pos = 1; - - for (nd = rb_first(&self->hists); nd; nd = rb_next(nd)) { - struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node); - printed += hist_entry__fprintf_matched(he, pos++, self, pair, fp); - } - - return printed; } static int __cmd_diff(void) @@ -226,8 +146,8 @@ static int __cmd_diff(void) int ret, i; struct perf_session *session[2]; - session[0] = perf_session__new(input_old, O_RDONLY, force, &symbol_conf); - session[1] = perf_session__new(input_new, O_RDONLY, force, &symbol_conf); + session[0] = perf_session__new(input_old, O_RDONLY, force, false); + session[1] = perf_session__new(input_new, O_RDONLY, force, false); if (session[0] == NULL || session[1] == NULL) return -ENOMEM; @@ -235,43 +155,55 @@ static int __cmd_diff(void) ret = perf_session__process_events(session[i], &event_ops); if (ret) goto out_delete; - perf_session__output_resort(session[i], session[i]->events_stats.total); } - perf_session__match_hists(session[0], session[1]); - perf_session__fprintf_matched_hists(session[1], session[0], stdout); + hists__output_resort(&session[1]->hists); + if (show_displacement) + hists__set_positions(&session[0]->hists); + + hists__match(&session[0]->hists, &session[1]->hists); + hists__fprintf(&session[1]->hists, &session[0]->hists, + show_displacement, stdout); out_delete: for (i = 0; i < 2; ++i) perf_session__delete(session[i]); return ret; } -static const char *const diff_usage[] = { +static const char * const diff_usage[] = { "perf diff [] [old_file] [new_file]", + NULL, }; static const struct option options[] = { - OPT_BOOLEAN('v', "verbose", &verbose, + OPT_INCR('v', "verbose", &verbose, "be more verbose (show symbol address, etc)"), + OPT_BOOLEAN('m', "displacement", &show_displacement, + "Show position displacement relative to baseline"), OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, "load module symbols - WARNING: use only with -k and LIVE kernel"), - OPT_BOOLEAN('p', "percentages", &show_percent, - "Don't shorten the pathnames taking into account the cwd"), - OPT_BOOLEAN('P', "full-paths", &event_ops.full_paths, + OPT_BOOLEAN('P', "full-paths", &symbol_conf.full_paths, "Don't shorten the pathnames taking into account the cwd"), + OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", + "only consider symbols in these dsos"), + OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]", + "only consider symbols in these comms"), + OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", + "only consider these symbols"), + OPT_STRING('s', "sort", &sort_order, "key[,key2...]", + "sort by key(s): pid, comm, dso, symbol, parent"), + OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", + "separator for columns, no spaces will be added between " + "columns '.' is reserved."), OPT_END() }; int cmd_diff(int argc, const char **argv, const char *prefix __used) { - if (symbol__init(&symbol_conf) < 0) - return -1; - - setup_sorting(diff_usage, options); - + sort_order = diff__default_sort_order; argc = parse_options(argc, argv, options, diff_usage, 0); if (argc) { if (argc > 2) @@ -281,8 +213,22 @@ int cmd_diff(int argc, const char **argv, const char *prefix __used) input_new = argv[1]; } else input_new = argv[0]; + } else if (symbol_conf.default_guest_vmlinux_name || + symbol_conf.default_guest_kallsyms) { + input_old = "perf.data.host"; + input_new = "perf.data.guest"; } + symbol_conf.exclude_other = false; + if (symbol__init() < 0) + return -1; + + setup_sorting(diff_usage, options); setup_pager(); + + sort_entry__setup_elide(&sort_dso, symbol_conf.dso_list, "dso", NULL); + sort_entry__setup_elide(&sort_comm, symbol_conf.comm_list, "comm", NULL); + sort_entry__setup_elide(&sort_sym, symbol_conf.sym_list, "symbol", NULL); + return __cmd_diff(); }