1 files changed, 27 insertions, 27 deletions

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index fac08e1f6330..06ef1c35a65a 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -537,7 +537,7 @@ int perf_session_queue_event(struct perf_session *s, union perf_event *event,
                 pr_oe_time(oe->last_flush, "last flush, last_flush_type %d\n",
                            oe->last_flush_type);
 
-                s->stats.nr_unordered_events++;
+                s->evlist->stats.nr_unordered_events++;
         }
 
         new = ordered_events__new(oe, timestamp, event);
@@ -841,7 +841,7 @@ static int deliver_sample_value(struct perf_session *session,
         }
 
         if (!sid || sid->evsel == NULL) {
-                ++session->stats.nr_unknown_id;
+                ++session->evlist->stats.nr_unknown_id;
                 return 0;
         }
 
@@ -911,11 +911,11 @@ int perf_session__deliver_event(struct perf_session *session,
         case PERF_RECORD_SAMPLE:
                 dump_sample(evsel, event, sample);
                 if (evsel == NULL) {
-                        ++session->stats.nr_unknown_id;
+                        ++session->evlist->stats.nr_unknown_id;
                         return 0;
                 }
                 if (machine == NULL) {
-                        ++session->stats.nr_unprocessable_samples;
+                        ++session->evlist->stats.nr_unprocessable_samples;
                         return 0;
                 }
                 return perf_session__deliver_sample(session, tool, event,
@@ -932,7 +932,7 @@ int perf_session__deliver_event(struct perf_session *session,
                 return tool->exit(tool, event, sample, machine);
         case PERF_RECORD_LOST:
                 if (tool->lost == perf_event__process_lost)
-                        session->stats.total_lost += event->lost.lost;
+                        session->evlist->stats.total_lost += event->lost.lost;
                 return tool->lost(tool, event, sample, machine);
         case PERF_RECORD_READ:
                 return tool->read(tool, event, sample, evsel, machine);
@@ -941,7 +941,7 @@ int perf_session__deliver_event(struct perf_session *session,
         case PERF_RECORD_UNTHROTTLE:
                 return tool->unthrottle(tool, event, sample, machine);
         default:
-                ++session->stats.nr_unknown_events;
+                ++session->evlist->stats.nr_unknown_events;
                 return -1;
         }
 }
@@ -991,7 +991,7 @@ int perf_session__deliver_synth_event(struct perf_session *session,
                                       struct perf_sample *sample,
                                       struct perf_tool *tool)
 {
-        events_stats__inc(&session->stats, event->header.type);
+        events_stats__inc(&session->evlist->stats, event->header.type);
 
         if (event->header.type >= PERF_RECORD_USER_TYPE_START)
                 return perf_session__process_user_event(session, event, tool, 0);
@@ -1077,7 +1077,7 @@ static s64 perf_session__process_event(struct perf_session *session,
         if (event->header.type >= PERF_RECORD_HEADER_MAX)
                 return -EINVAL;
 
-        events_stats__inc(&session->stats, event->header.type);
+        events_stats__inc(&session->evlist->stats, event->header.type);
 
         if (event->header.type >= PERF_RECORD_USER_TYPE_START)
                 return perf_session__process_user_event(session, event, tool, file_offset);
@@ -1129,43 +1129,43 @@ static void perf_session__warn_about_errors(const struct perf_session *session,
                                             const struct perf_tool *tool)
 {
         if (tool->lost == perf_event__process_lost &&
-            session->stats.nr_events[PERF_RECORD_LOST] != 0) {
+            session->evlist->stats.nr_events[PERF_RECORD_LOST] != 0) {
                 ui__warning("Processed %d events and lost %d chunks!\n\n"
                             "Check IO/CPU overload!\n\n",
-                            session->stats.nr_events[0],
-                            session->stats.nr_events[PERF_RECORD_LOST]);
+                            session->evlist->stats.nr_events[0],
+                            session->evlist->stats.nr_events[PERF_RECORD_LOST]);
         }
 
-        if (session->stats.nr_unknown_events != 0) {
+        if (session->evlist->stats.nr_unknown_events != 0) {
                 ui__warning("Found %u unknown events!\n\n"
                             "Is this an older tool processing a perf.data "
                             "file generated by a more recent tool?\n\n"
                             "If that is not the case, consider "
                             "reporting to linux-kernel@vger.kernel.org.\n\n",
-                            session->stats.nr_unknown_events);
+                            session->evlist->stats.nr_unknown_events);
         }
 
-        if (session->stats.nr_unknown_id != 0) {
+        if (session->evlist->stats.nr_unknown_id != 0) {
                 ui__warning("%u samples with id not present in the header\n",
-                            session->stats.nr_unknown_id);
+                            session->evlist->stats.nr_unknown_id);
         }
 
-        if (session->stats.nr_invalid_chains != 0) {
-                ui__warning("Found invalid callchains!\n\n"
-                            "%u out of %u events were discarded for this reason.\n\n"
-                            "Consider reporting to linux-kernel@vger.kernel.org.\n\n",
-                            session->stats.nr_invalid_chains,
-                            session->stats.nr_events[PERF_RECORD_SAMPLE]);
-        }
+        if (session->evlist->stats.nr_invalid_chains != 0) {
+                ui__warning("Found invalid callchains!\n\n"
+                            "%u out of %u events were discarded for this reason.\n\n"
+                            "Consider reporting to linux-kernel@vger.kernel.org.\n\n",
+                            session->evlist->stats.nr_invalid_chains,
+                            session->evlist->stats.nr_events[PERF_RECORD_SAMPLE]);
+        }
 
-        if (session->stats.nr_unprocessable_samples != 0) {
+        if (session->evlist->stats.nr_unprocessable_samples != 0) {
                 ui__warning("%u unprocessable samples recorded.\n"
                             "Do you have a KVM guest running and not using 'perf kvm'?\n",
-                            session->stats.nr_unprocessable_samples);
+                            session->evlist->stats.nr_unprocessable_samples);
         }
 
-        if (session->stats.nr_unordered_events != 0)
-                ui__warning("%u out of order events recorded.\n", session->stats.nr_unordered_events);
+        if (session->evlist->stats.nr_unordered_events != 0)
+                ui__warning("%u out of order events recorded.\n", session->evlist->stats.nr_unordered_events);
 }
 
 volatile int session_done;
@@ -1485,7 +1485,7 @@ size_t perf_session__fprintf_nr_events(struct perf_session *session, FILE *fp)
 {
         size_t ret = fprintf(fp, "Aggregated stats:\n");
 
-        ret += events_stats__fprintf(&session->stats, fp);
+        ret += events_stats__fprintf(&session->evlist->stats, fp);
         return ret;
 }