perf evlist: Adopt events_stats from perf_session

For tools that don't deal with perf.data files, thus do not need to
use perf_session.

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: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-kglq67gvauq9tak02a4se00r@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 891c3930080e3b406282d1c8059635a5e1828e40..7ce296618717ee7df8d65fdd7919030f2425c800 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1473,9 +1473,9 @@ static int perf_sched__read_events(struct perf_sched *sched,
                        goto out_delete;
                }
 
-               sched->nr_events      = session->stats.nr_events[0];
-               sched->nr_lost_events = session->stats.total_lost;
-               sched->nr_lost_chunks = session->stats.nr_events[PERF_RECORD_LOST];
+               sched->nr_events      = session->evlist->stats.nr_events[0];
+               sched->nr_lost_events = session->evlist->stats.total_lost;
+               sched->nr_lost_chunks = session->evlist->stats.nr_events[PERF_RECORD_LOST];
        }
 
        if (psession)

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index c4c7eac69de46405a6aec8c35aa6e9508c4d249a..5fb8723c7128810d7fbb52f06389d97217bd32b7 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -716,7 +716,7 @@ static void perf_event__process_sample(struct perf_tool *tool,
 
        if (!machine) {
                pr_err("%u unprocessable samples recorded.\r",
-                      top->session->stats.nr_unprocessable_samples++);
+                      top->session->evlist->stats.nr_unprocessable_samples++);
                return;
        }
 
@@ -856,7 +856,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
                        hists__inc_nr_events(evsel__hists(evsel), event->header.type);
                        machine__process_event(machine, event, &sample);
                } else
-                       ++session->stats.nr_unknown_events;
+                       ++session->evlist->stats.nr_unknown_events;
 next_event:
                perf_evlist__mmap_consume(top->evlist, idx);
        }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index c19ff45c9ad58e48d124edbe6a9b2036c0a48700..d4768a30f88422c2db39020d4173861f67bfad26 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -51,6 +51,7 @@ struct perf_evlist {
        struct thread_map *threads;
        struct cpu_map    *cpus;
        struct perf_evsel *selected;
+       struct events_stats stats;
 };
 
 struct perf_evsel_str_handler {

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index fac08e1f6330986dd6c1da490e6318a022459910..06ef1c35a65a5ca4a9fadc56ec6e3d26a9f1e9c9 100644 (file)
--- 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;
 }
 

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 6d663dc76404395ad6231fcf93bd881b9978fab8..fe859f379ca786e96a3ad822e4f25dd585939b52 100644 (file)
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -20,7 +20,6 @@ struct perf_session {
        struct machines         machines;
        struct perf_evlist      *evlist;
        struct trace_event      tevent;
-       struct events_stats     stats;
        bool                    repipe;
        bool                    one_mmap;
        void                    *one_mmap_addr;