microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

perf evsel: Add hists helper 

Not all tools need a hists instance per perf_evsel, so lets pave the way
to remove evsel->hists while leaving a way to access the hists from a
specially allocated evsel, one that comes with space at the end where
lives the evsel.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
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-qlktkhe31w4mgtbd84035sr2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2014-10-09 13:13:41 -03:00
Родитель 49c23f2d54
Коммит 4ea062ed43
14 изменённых файлов: 132 добавлений и 101 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
tools/perf/builtin-annotate.c
Просмотреть файл

@ -51,6 +51,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
struct addr_location *al, struct addr_location *al,
struct perf_annotate *ann) struct perf_annotate *ann)
{ {
struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
int ret; int ret;
@ -66,13 +67,12 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
return 0; return 0;
} }
he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0, he = __hists__add_entry(hists, al, NULL, NULL, NULL, 1, 1, 0, true);
true);
if (he == NULL) if (he == NULL)
return -ENOMEM; return -ENOMEM;
ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr); ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
hists__inc_nr_samples(&evsel->hists, true); hists__inc_nr_samples(hists, true);
return ret; return ret;
} }
@ -225,7 +225,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
total_nr_samples = 0; total_nr_samples = 0;
evlist__for_each(session->evlist, pos) { evlist__for_each(session->evlist, pos) {
struct hists *hists = &pos->hists; struct hists *hists = evsel__hists(pos);
u32 nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE]; u32 nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];
if (nr_samples > 0) { if (nr_samples > 0) {

21
tools/perf/builtin-diff.c
Просмотреть файл

@ -327,6 +327,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
struct machine *machine) struct machine *machine)
{ {
struct addr_location al; struct addr_location al;
struct hists *hists = evsel__hists(evsel);
if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
pr_warning("problem processing %d event, skipping it.\n", pr_warning("problem processing %d event, skipping it.\n",
@ -334,7 +335,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
return -1; return -1;
} }
if (hists__add_entry(&evsel->hists, &al, sample->period, if (hists__add_entry(hists, &al, sample->period,
sample->weight, sample->transaction)) { sample->weight, sample->transaction)) {
pr_warning("problem incrementing symbol period, skipping event\n"); pr_warning("problem incrementing symbol period, skipping event\n");
return -1; return -1;
@ -346,9 +347,9 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
* hists__output_resort() and precompute needs the total * hists__output_resort() and precompute needs the total
* period in order to sort entries by percentage delta. * period in order to sort entries by percentage delta.
*/ */
evsel->hists.stats.total_period += sample->period; hists->stats.total_period += sample->period;
if (!al.filtered) if (!al.filtered)
evsel->hists.stats.total_non_filtered_period += sample->period; hists->stats.total_non_filtered_period += sample->period;
return 0; return 0;
} }
@ -382,7 +383,7 @@ static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
struct perf_evsel *evsel; struct perf_evsel *evsel;
evlist__for_each(evlist, evsel) { evlist__for_each(evlist, evsel) {
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
} }
@ -631,24 +632,26 @@ static void data_process(void)
bool first = true; bool first = true;
evlist__for_each(evlist_base, evsel_base) { evlist__for_each(evlist_base, evsel_base) {
struct hists *hists_base = evsel__hists(evsel_base);
struct data__file *d; struct data__file *d;
int i; int i;
data__for_each_file_new(i, d) { data__for_each_file_new(i, d) {
struct perf_evlist *evlist = d->session->evlist; struct perf_evlist *evlist = d->session->evlist;
struct perf_evsel *evsel; struct perf_evsel *evsel;
struct hists *hists;
evsel = evsel_match(evsel_base, evlist); evsel = evsel_match(evsel_base, evlist);
if (!evsel) if (!evsel)
continue; continue;
d->hists = &evsel->hists; hists = evsel__hists(evsel);
d->hists = hists;
hists__match(&evsel_base->hists, &evsel->hists); hists__match(hists_base, hists);
if (!show_baseline_only) if (!show_baseline_only)
hists__link(&evsel_base->hists, hists__link(hists_base, hists);
&evsel->hists);
} }
fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n", fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
@ -659,7 +662,7 @@ static void data_process(void)
if (verbose || data__files_cnt > 2) if (verbose || data__files_cnt > 2)
data__fprintf(); data__fprintf();
hists__process(&evsel_base->hists); hists__process(hists_base);
} }
} }

18
tools/perf/builtin-report.c
Просмотреть файл

@ -288,12 +288,14 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report
evname = buf; evname = buf;
for_each_group_member(pos, evsel) { for_each_group_member(pos, evsel) {
const struct hists *pos_hists = evsel__hists(pos);
if (symbol_conf.filter_relative) { if (symbol_conf.filter_relative) {
nr_samples += pos->hists.stats.nr_non_filtered_samples; nr_samples += pos_hists->stats.nr_non_filtered_samples;
nr_events += pos->hists.stats.total_non_filtered_period; nr_events += pos_hists->stats.total_non_filtered_period;
} else { } else {
nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE]; nr_samples += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
nr_events += pos->hists.stats.total_period; nr_events += pos_hists->stats.total_period;
} }
} }
} }
@ -318,7 +320,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
struct perf_evsel *pos; struct perf_evsel *pos;
evlist__for_each(evlist, pos) { evlist__for_each(evlist, pos) {
struct hists *hists = &pos->hists; struct hists *hists = evsel__hists(pos);
const char *evname = perf_evsel__name(pos); const char *evname = perf_evsel__name(pos);
if (symbol_conf.event_group && if (symbol_conf.event_group &&
@ -427,7 +429,7 @@ static void report__collapse_hists(struct report *rep)
ui_progress__init(&prog, rep->nr_entries, "Merging related events..."); ui_progress__init(&prog, rep->nr_entries, "Merging related events...");
evlist__for_each(rep->session->evlist, pos) { evlist__for_each(rep->session->evlist, pos) {
struct hists *hists = &pos->hists; struct hists *hists = evsel__hists(pos);
if (pos->idx == 0) if (pos->idx == 0)
hists->symbol_filter_str = rep->symbol_filter_str; hists->symbol_filter_str = rep->symbol_filter_str;
@ -437,7 +439,7 @@ static void report__collapse_hists(struct report *rep)
/* Non-group events are considered as leader */ /* Non-group events are considered as leader */
if (symbol_conf.event_group && if (symbol_conf.event_group &&
!perf_evsel__is_group_leader(pos)) { !perf_evsel__is_group_leader(pos)) {
struct hists *leader_hists = &pos->leader->hists; struct hists *leader_hists = evsel__hists(pos->leader);
hists__match(leader_hists, hists); hists__match(leader_hists, hists);
hists__link(leader_hists, hists); hists__link(leader_hists, hists);
@ -500,7 +502,7 @@ static int __cmd_report(struct report *rep)
} }
evlist__for_each(session->evlist, pos) evlist__for_each(session->evlist, pos)
hists__output_resort(&pos->hists); hists__output_resort(evsel__hists(pos));
return report__browse_hists(rep); return report__browse_hists(rep);
} }

55
tools/perf/builtin-top.c
Просмотреть файл

@ -251,6 +251,7 @@ static void perf_top__print_sym_table(struct perf_top *top)
char bf[160]; char bf[160];
int printed = 0; int printed = 0;
const int win_width = top->winsize.ws_col - 1; const int win_width = top->winsize.ws_col - 1;
struct hists *hists = evsel__hists(top->sym_evsel);
puts(CONSOLE_CLEAR); puts(CONSOLE_CLEAR);
@ -261,13 +262,13 @@ static void perf_top__print_sym_table(struct perf_top *top)
printf("%-*.*s\n", win_width, win_width, graph_dotted_line); printf("%-*.*s\n", win_width, win_width, graph_dotted_line);
if (top->sym_evsel->hists.stats.nr_lost_warned != if (hists->stats.nr_lost_warned !=
top->sym_evsel->hists.stats.nr_events[PERF_RECORD_LOST]) { hists->stats.nr_events[PERF_RECORD_LOST]) {
top->sym_evsel->hists.stats.nr_lost_warned = hists->stats.nr_lost_warned =
top->sym_evsel->hists.stats.nr_events[PERF_RECORD_LOST]; hists->stats.nr_events[PERF_RECORD_LOST];
color_fprintf(stdout, PERF_COLOR_RED, color_fprintf(stdout, PERF_COLOR_RED,
"WARNING: LOST %d chunks, Check IO/CPU overload", "WARNING: LOST %d chunks, Check IO/CPU overload",
top->sym_evsel->hists.stats.nr_lost_warned); hists->stats.nr_lost_warned);
++printed; ++printed;
} }
@ -277,21 +278,18 @@ static void perf_top__print_sym_table(struct perf_top *top)
} }
if (top->zero) { if (top->zero) {
hists__delete_entries(&top->sym_evsel->hists); hists__delete_entries(hists);
} else { } else {
hists__decay_entries(&top->sym_evsel->hists, hists__decay_entries(hists, top->hide_user_symbols,
top->hide_user_symbols,
top->hide_kernel_symbols); top->hide_kernel_symbols);
} }
hists__collapse_resort(&top->sym_evsel->hists, NULL); hists__collapse_resort(hists, NULL);
hists__output_resort(&top->sym_evsel->hists); hists__output_resort(hists);
hists__output_recalc_col_len(&top->sym_evsel->hists, hists__output_recalc_col_len(hists, top->print_entries - printed);
top->print_entries - printed);
putchar('\n'); putchar('\n');
hists__fprintf(&top->sym_evsel->hists, false, hists__fprintf(hists, false, top->print_entries - printed, win_width,
top->print_entries - printed, win_width,
top->min_percent, stdout); top->min_percent, stdout);
} }
@ -334,6 +332,7 @@ static void perf_top__prompt_symbol(struct perf_top *top, const char *msg)
{ {
char *buf = malloc(0), *p; char *buf = malloc(0), *p;
struct hist_entry *syme = top->sym_filter_entry, *n, *found = NULL; struct hist_entry *syme = top->sym_filter_entry, *n, *found = NULL;
struct hists *hists = evsel__hists(top->sym_evsel);
struct rb_node *next; struct rb_node *next;
size_t dummy = 0; size_t dummy = 0;
@ -351,7 +350,7 @@ static void perf_top__prompt_symbol(struct perf_top *top, const char *msg)
if (p) if (p)
*p = 0; *p = 0;
next = rb_first(&top->sym_evsel->hists.entries); next = rb_first(&hists->entries);
while (next) { while (next) {
n = rb_entry(next, struct hist_entry, rb_node); n = rb_entry(next, struct hist_entry, rb_node);
if (n->ms.sym && !strcmp(buf, n->ms.sym->name)) { if (n->ms.sym && !strcmp(buf, n->ms.sym->name)) {
@ -538,21 +537,24 @@ static bool perf_top__handle_keypress(struct perf_top *top, int c)
static void perf_top__sort_new_samples(void *arg) static void perf_top__sort_new_samples(void *arg)
{ {
struct perf_top *t = arg; struct perf_top *t = arg;
struct hists *hists;
perf_top__reset_sample_counters(t); perf_top__reset_sample_counters(t);
if (t->evlist->selected != NULL) if (t->evlist->selected != NULL)
t->sym_evsel = t->evlist->selected; t->sym_evsel = t->evlist->selected;
hists = evsel__hists(t->sym_evsel);
if (t->zero) { if (t->zero) {
hists__delete_entries(&t->sym_evsel->hists); hists__delete_entries(hists);
} else { } else {
hists__decay_entries(&t->sym_evsel->hists, hists__decay_entries(hists, t->hide_user_symbols,
t->hide_user_symbols,
t->hide_kernel_symbols); t->hide_kernel_symbols);
} }
hists__collapse_resort(&t->sym_evsel->hists, NULL); hists__collapse_resort(hists, NULL);
hists__output_resort(&t->sym_evsel->hists); hists__output_resort(hists);
} }
static void *display_thread_tui(void *arg) static void *display_thread_tui(void *arg)
@ -573,8 +575,10 @@ static void *display_thread_tui(void *arg)
* Zooming in/out UIDs. For now juse use whatever the user passed * Zooming in/out UIDs. For now juse use whatever the user passed
* via --uid. * via --uid.
*/ */
evlist__for_each(top->evlist, pos) evlist__for_each(top->evlist, pos) {
pos->hists.uid_filter_str = top->record_opts.target.uid_str; struct hists *hists = evsel__hists(pos);
hists->uid_filter_str = top->record_opts.target.uid_str;
}
perf_evlist__tui_browse_hists(top->evlist, help, &hbt, top->min_percent, perf_evlist__tui_browse_hists(top->evlist, help, &hbt, top->min_percent,
&top->session->header.env); &top->session->header.env);
@ -768,6 +772,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
} }
if (al.sym == NULL || !al.sym->ignore) { if (al.sym == NULL || !al.sym->ignore) {
struct hists *hists = evsel__hists(evsel);
struct hist_entry_iter iter = { struct hist_entry_iter iter = {
.add_entry_cb = hist_iter__top_callback, .add_entry_cb = hist_iter__top_callback,
}; };
@ -777,14 +782,14 @@ static void perf_event__process_sample(struct perf_tool *tool,
else else
iter.ops = &hist_iter_normal; iter.ops = &hist_iter_normal;
pthread_mutex_lock(&evsel->hists.lock); pthread_mutex_lock(&hists->lock);
err = hist_entry_iter__add(&iter, &al, evsel, sample, err = hist_entry_iter__add(&iter, &al, evsel, sample,
top->max_stack, top); top->max_stack, top);
if (err < 0) if (err < 0)
pr_err("Problem incrementing symbol period, skipping event\n"); pr_err("Problem incrementing symbol period, skipping event\n");
pthread_mutex_unlock(&evsel->hists.lock); pthread_mutex_unlock(&hists->lock);
} }
return; return;
@ -849,7 +854,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
perf_event__process_sample(&top->tool, event, evsel, perf_event__process_sample(&top->tool, event, evsel,
&sample, machine); &sample, machine);
} else if (event->header.type < PERF_RECORD_MAX) { } else if (event->header.type < PERF_RECORD_MAX) {
hists__inc_nr_events(&evsel->hists, event->header.type); hists__inc_nr_events(evsel__hists(evsel), event->header.type);
machine__process_event(machine, event, &sample); machine__process_event(machine, event, &sample);
} else } else
++session->stats.nr_unknown_events; ++session->stats.nr_unknown_events;

8
tools/perf/tests/hists_cumulate.c
Просмотреть файл

@ -245,7 +245,7 @@ static int do_test(struct hists *hists, struct result *expected, size_t nr_expec
static int test1(struct perf_evsel *evsel, struct machine *machine) static int test1(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
/* /*
* expected output: * expected output:
* *
@ -295,7 +295,7 @@ out:
static int test2(struct perf_evsel *evsel, struct machine *machine) static int test2(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
/* /*
* expected output: * expected output:
* *
@ -442,7 +442,7 @@ out:
static int test3(struct perf_evsel *evsel, struct machine *machine) static int test3(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
/* /*
* expected output: * expected output:
* *
@ -498,7 +498,7 @@ out:
static int test4(struct perf_evsel *evsel, struct machine *machine) static int test4(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
/* /*
* expected output: * expected output:
* *

23
tools/perf/tests/hists_filter.c
Просмотреть файл

@ -66,11 +66,12 @@ static int add_hist_entries(struct perf_evlist *evlist,
.ops = &hist_iter_normal, .ops = &hist_iter_normal,
.hide_unresolved = false, .hide_unresolved = false,
}; };
struct hists *hists = evsel__hists(evsel);
/* make sure it has no filter at first */ /* make sure it has no filter at first */
evsel->hists.thread_filter = NULL; hists->thread_filter = NULL;
evsel->hists.dso_filter = NULL; hists->dso_filter = NULL;
evsel->hists.symbol_filter_str = NULL; hists->symbol_filter_str = NULL;
sample.pid = fake_samples[i].pid; sample.pid = fake_samples[i].pid;
sample.tid = fake_samples[i].pid; sample.tid = fake_samples[i].pid;
@ -134,7 +135,7 @@ int test__hists_filter(void)
goto out; goto out;
evlist__for_each(evlist, evsel) { evlist__for_each(evlist, evsel) {
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
hists__collapse_resort(hists, NULL); hists__collapse_resort(hists, NULL);
hists__output_resort(hists); hists__output_resort(hists);
@ -160,7 +161,7 @@ int test__hists_filter(void)
hists->stats.total_non_filtered_period); hists->stats.total_non_filtered_period);
/* now applying thread filter for 'bash' */ /* now applying thread filter for 'bash' */
evsel->hists.thread_filter = fake_samples[9].thread; hists->thread_filter = fake_samples[9].thread;
hists__filter_by_thread(hists); hists__filter_by_thread(hists);
if (verbose > 2) { if (verbose > 2) {
@ -185,11 +186,11 @@ int test__hists_filter(void)
hists->stats.total_non_filtered_period == 400); hists->stats.total_non_filtered_period == 400);
/* remove thread filter first */ /* remove thread filter first */
evsel->hists.thread_filter = NULL; hists->thread_filter = NULL;
hists__filter_by_thread(hists); hists__filter_by_thread(hists);
/* now applying dso filter for 'kernel' */ /* now applying dso filter for 'kernel' */
evsel->hists.dso_filter = fake_samples[0].map->dso; hists->dso_filter = fake_samples[0].map->dso;
hists__filter_by_dso(hists); hists__filter_by_dso(hists);
if (verbose > 2) { if (verbose > 2) {
@ -214,7 +215,7 @@ int test__hists_filter(void)
hists->stats.total_non_filtered_period == 300); hists->stats.total_non_filtered_period == 300);
/* remove dso filter first */ /* remove dso filter first */
evsel->hists.dso_filter = NULL; hists->dso_filter = NULL;
hists__filter_by_dso(hists); hists__filter_by_dso(hists);
/* /*
@ -224,7 +225,7 @@ int test__hists_filter(void)
* be counted as a separate entry but the sample count and * be counted as a separate entry but the sample count and
* total period will be remained. * total period will be remained.
*/ */
evsel->hists.symbol_filter_str = "main"; hists->symbol_filter_str = "main";
hists__filter_by_symbol(hists); hists__filter_by_symbol(hists);
if (verbose > 2) { if (verbose > 2) {
@ -249,8 +250,8 @@ int test__hists_filter(void)
hists->stats.total_non_filtered_period == 300); hists->stats.total_non_filtered_period == 300);
/* now applying all filters at once. */ /* now applying all filters at once. */
evsel->hists.thread_filter = fake_samples[1].thread; hists->thread_filter = fake_samples[1].thread;
evsel->hists.dso_filter = fake_samples[1].map->dso; hists->dso_filter = fake_samples[1].map->dso;
hists__filter_by_thread(hists); hists__filter_by_thread(hists);
hists__filter_by_dso(hists); hists__filter_by_dso(hists);

23
tools/perf/tests/hists_link.c
Просмотреть файл

@ -73,6 +73,8 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
* "bash [libc] malloc" so total 9 entries will be in the tree. * "bash [libc] malloc" so total 9 entries will be in the tree.
*/ */
evlist__for_each(evlist, evsel) { evlist__for_each(evlist, evsel) {
struct hists *hists = evsel__hists(evsel);
for (k = 0; k < ARRAY_SIZE(fake_common_samples); k++) { for (k = 0; k < ARRAY_SIZE(fake_common_samples); k++) {
const union perf_event event = { const union perf_event event = {
.header = { .header = {
@ -87,7 +89,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
&sample) < 0) &sample) < 0)
goto out; goto out;
he = __hists__add_entry(&evsel->hists, &al, NULL, he = __hists__add_entry(hists, &al, NULL,
NULL, NULL, 1, 1, 0, true); NULL, NULL, 1, 1, 0, true);
if (he == NULL) if (he == NULL)
goto out; goto out;
@ -111,7 +113,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
&sample) < 0) &sample) < 0)
goto out; goto out;
he = __hists__add_entry(&evsel->hists, &al, NULL, he = __hists__add_entry(hists, &al, NULL,
NULL, NULL, 1, 1, 0, true); NULL, NULL, 1, 1, 0, true);
if (he == NULL) if (he == NULL)
goto out; goto out;
@ -271,6 +273,7 @@ static int validate_link(struct hists *leader, struct hists *other)
int test__hists_link(void) int test__hists_link(void)
{ {
int err = -1; int err = -1;
struct hists *hists, *first_hists;
struct machines machines; struct machines machines;
struct machine *machine = NULL; struct machine *machine = NULL;
struct perf_evsel *evsel, *first; struct perf_evsel *evsel, *first;
@ -306,24 +309,28 @@ int test__hists_link(void)
goto out; goto out;
evlist__for_each(evlist, evsel) { evlist__for_each(evlist, evsel) {
hists__collapse_resort(&evsel->hists, NULL); hists = evsel__hists(evsel);
hists__collapse_resort(hists, NULL);
if (verbose > 2) if (verbose > 2)
print_hists_in(&evsel->hists); print_hists_in(hists);
} }
first = perf_evlist__first(evlist); first = perf_evlist__first(evlist);
evsel = perf_evlist__last(evlist); evsel = perf_evlist__last(evlist);
first_hists = evsel__hists(first);
hists = evsel__hists(evsel);
/* match common entries */ /* match common entries */
hists__match(&first->hists, &evsel->hists); hists__match(first_hists, hists);
err = validate_match(&first->hists, &evsel->hists); err = validate_match(first_hists, hists);
if (err) if (err)
goto out; goto out;
/* link common and/or dummy entries */ /* link common and/or dummy entries */
hists__link(&first->hists, &evsel->hists); hists__link(first_hists, hists);
err = validate_link(&first->hists, &evsel->hists); err = validate_link(first_hists, hists);
if (err) if (err)
goto out; goto out;

20
tools/perf/tests/hists_output.c
Просмотреть файл

@ -122,7 +122,7 @@ typedef int (*test_fn_t)(struct perf_evsel *, struct machine *);
static int test1(struct perf_evsel *evsel, struct machine *machine) static int test1(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
@ -159,7 +159,7 @@ static int test1(struct perf_evsel *evsel, struct machine *machine)
print_hists_out(hists); print_hists_out(hists);
} }
root = &evsel->hists.entries; root = &hists->entries;
node = rb_first(root); node = rb_first(root);
he = rb_entry(node, struct hist_entry, rb_node); he = rb_entry(node, struct hist_entry, rb_node);
TEST_ASSERT_VAL("Invalid hist entry", TEST_ASSERT_VAL("Invalid hist entry",
@ -224,7 +224,7 @@ out:
static int test2(struct perf_evsel *evsel, struct machine *machine) static int test2(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
@ -259,7 +259,7 @@ static int test2(struct perf_evsel *evsel, struct machine *machine)
print_hists_out(hists); print_hists_out(hists);
} }
root = &evsel->hists.entries; root = &hists->entries;
node = rb_first(root); node = rb_first(root);
he = rb_entry(node, struct hist_entry, rb_node); he = rb_entry(node, struct hist_entry, rb_node);
TEST_ASSERT_VAL("Invalid hist entry", TEST_ASSERT_VAL("Invalid hist entry",
@ -280,7 +280,7 @@ out:
static int test3(struct perf_evsel *evsel, struct machine *machine) static int test3(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
@ -313,7 +313,7 @@ static int test3(struct perf_evsel *evsel, struct machine *machine)
print_hists_out(hists); print_hists_out(hists);
} }
root = &evsel->hists.entries; root = &hists->entries;
node = rb_first(root); node = rb_first(root);
he = rb_entry(node, struct hist_entry, rb_node); he = rb_entry(node, struct hist_entry, rb_node);
TEST_ASSERT_VAL("Invalid hist entry", TEST_ASSERT_VAL("Invalid hist entry",
@ -354,7 +354,7 @@ out:
static int test4(struct perf_evsel *evsel, struct machine *machine) static int test4(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
@ -391,7 +391,7 @@ static int test4(struct perf_evsel *evsel, struct machine *machine)
print_hists_out(hists); print_hists_out(hists);
} }
root = &evsel->hists.entries; root = &hists->entries;
node = rb_first(root); node = rb_first(root);
he = rb_entry(node, struct hist_entry, rb_node); he = rb_entry(node, struct hist_entry, rb_node);
TEST_ASSERT_VAL("Invalid hist entry", TEST_ASSERT_VAL("Invalid hist entry",
@ -456,7 +456,7 @@ out:
static int test5(struct perf_evsel *evsel, struct machine *machine) static int test5(struct perf_evsel *evsel, struct machine *machine)
{ {
int err; int err;
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_entry *he; struct hist_entry *he;
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
@ -494,7 +494,7 @@ static int test5(struct perf_evsel *evsel, struct machine *machine)
print_hists_out(hists); print_hists_out(hists);
} }
root = &evsel->hists.entries; root = &hists->entries;
node = rb_first(root); node = rb_first(root);
he = rb_entry(node, struct hist_entry, rb_node); he = rb_entry(node, struct hist_entry, rb_node);

20
tools/perf/ui/browsers/hists.c
Просмотреть файл

@ -1229,12 +1229,14 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size)
ev_name = buf; ev_name = buf;
for_each_group_member(pos, evsel) { for_each_group_member(pos, evsel) {
struct hists *pos_hists = evsel__hists(pos);
if (symbol_conf.filter_relative) { if (symbol_conf.filter_relative) {
nr_samples += pos->hists.stats.nr_non_filtered_samples; nr_samples += pos_hists->stats.nr_non_filtered_samples;
nr_events += pos->hists.stats.total_non_filtered_period; nr_events += pos_hists->stats.total_non_filtered_period;
} else { } else {
nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE]; nr_samples += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
nr_events += pos->hists.stats.total_period; nr_events += pos_hists->stats.total_period;
} }
} }
} }
@ -1387,7 +1389,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
float min_pcnt, float min_pcnt,
struct perf_session_env *env) struct perf_session_env *env)
{ {
struct hists *hists = &evsel->hists; struct hists *hists = evsel__hists(evsel);
struct hist_browser *browser = hist_browser__new(hists); struct hist_browser *browser = hist_browser__new(hists);
struct branch_info *bi; struct branch_info *bi;
struct pstack *fstack; struct pstack *fstack;
@ -1802,8 +1804,9 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
struct perf_evsel_menu *menu = container_of(browser, struct perf_evsel_menu *menu = container_of(browser,
struct perf_evsel_menu, b); struct perf_evsel_menu, b);
struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node); struct perf_evsel *evsel = list_entry(entry, struct perf_evsel, node);
struct hists *hists = evsel__hists(evsel);
bool current_entry = ui_browser__is_current_entry(browser, row); bool current_entry = ui_browser__is_current_entry(browser, row);
unsigned long nr_events = evsel->hists.stats.nr_events[PERF_RECORD_SAMPLE]; unsigned long nr_events = hists->stats.nr_events[PERF_RECORD_SAMPLE];
const char *ev_name = perf_evsel__name(evsel); const char *ev_name = perf_evsel__name(evsel);
char bf[256], unit; char bf[256], unit;
const char *warn = " "; const char *warn = " ";
@ -1818,7 +1821,8 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
ev_name = perf_evsel__group_name(evsel); ev_name = perf_evsel__group_name(evsel);
for_each_group_member(pos, evsel) { for_each_group_member(pos, evsel) {
nr_events += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE]; struct hists *pos_hists = evsel__hists(pos);
nr_events += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
} }
} }
@ -1827,7 +1831,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
unit, unit == ' ' ? "" : " ", ev_name); unit, unit == ' ' ? "" : " ", ev_name);
slsmg_printf("%s", bf); slsmg_printf("%s", bf);
nr_events = evsel->hists.stats.nr_events[PERF_RECORD_LOST]; nr_events = hists->stats.nr_events[PERF_RECORD_LOST];
if (nr_events != 0) { if (nr_events != 0) {
menu->lost_events = true; menu->lost_events = true;
if (!current_entry) if (!current_entry)

2
tools/perf/ui/gtk/hists.c
Просмотреть файл

@ -319,7 +319,7 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
gtk_container_add(GTK_CONTAINER(window), vbox); gtk_container_add(GTK_CONTAINER(window), vbox);
evlist__for_each(evlist, pos) { evlist__for_each(evlist, pos) {
struct hists *hists = &pos->hists; struct hists *hists = evsel__hists(pos);
const char *evname = perf_evsel__name(pos); const char *evname = perf_evsel__name(pos);
GtkWidget *scrolled_window; GtkWidget *scrolled_window;
GtkWidget *tab_label; GtkWidget *tab_label;

5
tools/perf/util/evsel.h
Просмотреть файл

@ -102,6 +102,11 @@ union u64_swap {
#define hists_to_evsel(h) container_of(h, struct perf_evsel, hists) #define hists_to_evsel(h) container_of(h, struct perf_evsel, hists)
static inline struct hists *evsel__hists(struct perf_evsel *evsel)
{
return &evsel->hists;
}
struct cpu_map; struct cpu_map;
struct thread_map; struct thread_map;
struct perf_evlist; struct perf_evlist;

22
tools/perf/util/hist.c
Просмотреть файл

@ -509,6 +509,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
{ {
u64 cost; u64 cost;
struct mem_info *mi = iter->priv; struct mem_info *mi = iter->priv;
struct hists *hists = evsel__hists(iter->evsel);
struct hist_entry *he; struct hist_entry *he;
if (mi == NULL) if (mi == NULL)
@ -525,7 +526,7 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
* and this is indirectly achieved by passing period=weight here * and this is indirectly achieved by passing period=weight here
* and the he_stat__add_period() function. * and the he_stat__add_period() function.
*/ */
he = __hists__add_entry(&iter->evsel->hists, al, iter->parent, NULL, mi, he = __hists__add_entry(hists, al, iter->parent, NULL, mi,
cost, cost, 0, true); cost, cost, 0, true);
if (!he) if (!he)
return -ENOMEM; return -ENOMEM;
@ -539,13 +540,14 @@ iter_finish_mem_entry(struct hist_entry_iter *iter,
struct addr_location *al __maybe_unused) struct addr_location *al __maybe_unused)
{ {
struct perf_evsel *evsel = iter->evsel; struct perf_evsel *evsel = iter->evsel;
struct hists *hists = evsel__hists(evsel);
struct hist_entry *he = iter->he; struct hist_entry *he = iter->he;
int err = -EINVAL; int err = -EINVAL;
if (he == NULL) if (he == NULL)
goto out; goto out;
hists__inc_nr_samples(&evsel->hists, he->filtered); hists__inc_nr_samples(hists, he->filtered);
err = hist_entry__append_callchain(he, iter->sample); err = hist_entry__append_callchain(he, iter->sample);
@ -611,6 +613,7 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *a
{ {
struct branch_info *bi; struct branch_info *bi;
struct perf_evsel *evsel = iter->evsel; struct perf_evsel *evsel = iter->evsel;
struct hists *hists = evsel__hists(evsel);
struct hist_entry *he = NULL; struct hist_entry *he = NULL;
int i = iter->curr; int i = iter->curr;
int err = 0; int err = 0;
@ -624,12 +627,12 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *a
* The report shows the percentage of total branches captured * The report shows the percentage of total branches captured
* and not events sampled. Thus we use a pseudo period of 1. * and not events sampled. Thus we use a pseudo period of 1.
*/ */
he = __hists__add_entry(&evsel->hists, al, iter->parent, &bi[i], NULL, he = __hists__add_entry(hists, al, iter->parent, &bi[i], NULL,
1, 1, 0, true); 1, 1, 0, true);
if (he == NULL) if (he == NULL)
return -ENOMEM; return -ENOMEM;
hists__inc_nr_samples(&evsel->hists, he->filtered); hists__inc_nr_samples(hists, he->filtered);
out: out:
iter->he = he; iter->he = he;
@ -661,7 +664,7 @@ iter_add_single_normal_entry(struct hist_entry_iter *iter, struct addr_location
struct perf_sample *sample = iter->sample; struct perf_sample *sample = iter->sample;
struct hist_entry *he; struct hist_entry *he;
he = __hists__add_entry(&evsel->hists, al, iter->parent, NULL, NULL, he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
sample->period, sample->weight, sample->period, sample->weight,
sample->transaction, true); sample->transaction, true);
if (he == NULL) if (he == NULL)
@ -684,7 +687,7 @@ iter_finish_normal_entry(struct hist_entry_iter *iter,
iter->he = NULL; iter->he = NULL;
hists__inc_nr_samples(&evsel->hists, he->filtered); hists__inc_nr_samples(evsel__hists(evsel), he->filtered);
return hist_entry__append_callchain(he, sample); return hist_entry__append_callchain(he, sample);
} }
@ -717,12 +720,13 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter,
struct addr_location *al) struct addr_location *al)
{ {
struct perf_evsel *evsel = iter->evsel; struct perf_evsel *evsel = iter->evsel;
struct hists *hists = evsel__hists(evsel);
struct perf_sample *sample = iter->sample; struct perf_sample *sample = iter->sample;
struct hist_entry **he_cache = iter->priv; struct hist_entry **he_cache = iter->priv;
struct hist_entry *he; struct hist_entry *he;
int err = 0; int err = 0;
he = __hists__add_entry(&evsel->hists, al, iter->parent, NULL, NULL, he = __hists__add_entry(hists, al, iter->parent, NULL, NULL,
sample->period, sample->weight, sample->period, sample->weight,
sample->transaction, true); sample->transaction, true);
if (he == NULL) if (he == NULL)
@ -739,7 +743,7 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter,
*/ */
callchain_cursor_commit(&callchain_cursor); callchain_cursor_commit(&callchain_cursor);
hists__inc_nr_samples(&evsel->hists, he->filtered); hists__inc_nr_samples(hists, he->filtered);
return err; return err;
} }
@ -795,7 +799,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
} }
} }
he = __hists__add_entry(&evsel->hists, al, iter->parent, NULL, NULL, he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
sample->period, sample->weight, sample->period, sample->weight,
sample->transaction, false); sample->transaction, false);
if (he == NULL) if (he == NULL)

4
tools/perf/util/session.c
Просмотреть файл

@ -827,7 +827,7 @@ int perf_session__deliver_event(struct perf_session *session,
* future probably it'll be a good idea to restrict event * future probably it'll be a good idea to restrict event
* processing via perf_session to files with both set. * processing via perf_session to files with both set.
*/ */
hists__inc_nr_events(&evsel->hists, event->header.type); hists__inc_nr_events(evsel__hists(evsel), event->header.type);
} }
machine = perf_session__find_machine_for_cpumode(session, event, machine = perf_session__find_machine_for_cpumode(session, event,
@ -1398,7 +1398,7 @@ size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp)
evlist__for_each(session->evlist, pos) { evlist__for_each(session->evlist, pos) {
ret += fprintf(fp, "%s stats:\n", perf_evsel__name(pos)); ret += fprintf(fp, "%s stats:\n", perf_evsel__name(pos));
ret += events_stats__fprintf(&pos->hists.stats, fp); ret += events_stats__fprintf(&evsel__hists(pos)->stats, fp);
} }
return ret; return ret;

4
tools/perf/util/sort.c
Просмотреть файл

@ -1218,7 +1218,7 @@ static int __sort__hpp_header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
hse = container_of(fmt, struct hpp_sort_entry, hpp); hse = container_of(fmt, struct hpp_sort_entry, hpp);
if (!len) if (!len)
len = hists__col_len(&evsel->hists, hse->se->se_width_idx); len = hists__col_len(evsel__hists(evsel), hse->se->se_width_idx);
return scnprintf(hpp->buf, hpp->size, "%-*.*s", len, len, fmt->name); return scnprintf(hpp->buf, hpp->size, "%-*.*s", len, len, fmt->name);
} }
@ -1233,7 +1233,7 @@ static int __sort__hpp_width(struct perf_hpp_fmt *fmt,
hse = container_of(fmt, struct hpp_sort_entry, hpp); hse = container_of(fmt, struct hpp_sort_entry, hpp);
if (!len) if (!len)
len = hists__col_len(&evsel->hists, hse->se->se_width_idx); len = hists__col_len(evsel__hists(evsel), hse->se->se_width_idx);
return len; return len;
} }