Merge tag 'trace-v5.14-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / tools / perf / builtin-report.c

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index bc5c393..6386af6 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -332,7 +332,7 @@ static int process_read_event(struct perf_tool *tool,
                const char *name = evsel__name(evsel);
                int err = perf_read_values_add_value(&rep->show_threads_values,
                                           event->read.pid, event->read.tid,
-                                          evsel->idx,
+                                          evsel->core.idx,
                                           name,
                                           event->read.value);
 
@@ -666,7 +666,7 @@ static int report__collapse_hists(struct report *rep)
        evlist__for_each_entry(rep->session->evlist, pos) {
                struct hists *hists = evsel__hists(pos);
 
-               if (pos->idx == 0)
+               if (pos->core.idx == 0)
                        hists->symbol_filter_str = rep->symbol_filter_str;
 
                hists->socket_filter = rep->socket_filter;
@@ -677,7 +677,7 @@ static int report__collapse_hists(struct report *rep)
 
                /* Non-group events are considered as leader */
                if (symbol_conf.event_group && !evsel__is_group_leader(pos)) {
-                       struct hists *leader_hists = evsel__hists(pos->leader);
+                       struct hists *leader_hists = evsel__hists(evsel__leader(pos));
 
                        hists__match(leader_hists, hists);
                        hists__link(leader_hists, hists);
@@ -729,9 +729,14 @@ static int count_sample_event(struct perf_tool *tool __maybe_unused,
        return 0;
 }
 
+static int process_attr(struct perf_tool *tool __maybe_unused,
+                       union perf_event *event,
+                       struct evlist **pevlist);
+
 static void stats_setup(struct report *rep)
 {
        memset(&rep->tool, 0, sizeof(rep->tool));
+       rep->tool.attr = process_attr;
        rep->tool.sample = count_sample_event;
        rep->tool.no_warn = true;
 }
@@ -753,6 +758,7 @@ static void tasks_setup(struct report *rep)
                rep->tool.mmap = perf_event__process_mmap;
                rep->tool.mmap2 = perf_event__process_mmap2;
        }
+       rep->tool.attr = process_attr;
        rep->tool.comm = perf_event__process_comm;
        rep->tool.exit = perf_event__process_exit;
        rep->tool.fork = perf_event__process_fork;
@@ -1426,7 +1432,7 @@ repeat:
 
        setup_forced_leader(&report, session->evlist);
 
-       if (symbol_conf.group_sort_idx && !session->evlist->nr_groups) {
+       if (symbol_conf.group_sort_idx && !session->evlist->core.nr_groups) {
                parse_options_usage(NULL, options, "group-sort-idx", 0);
                ret = -EINVAL;
                goto error;