5 files changed, 29 insertions, 17 deletions

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 3e8fec173041..50771b5813ee 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -385,7 +385,7 @@ int event__process_comm(event_t *self, struct perf_session *session)
 int event__process_lost(event_t *self, struct perf_session *session)
 {
         dump_printf(": id:%Ld: lost:%Ld\n", self->lost.id, self->lost.lost);
-        session->hists.stats.lost += self->lost.lost;
+        session->hists.stats.total_lost += self->lost.lost;
         return 0;
 }
 
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 1614ad710046..c59224518083 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -239,7 +239,7 @@ void hists__output_resort(struct hists *self)
         struct hist_entry *n;
         u64 min_callchain_hits;
 
-        min_callchain_hits = self->stats.total * (callchain_param.min_percent / 100);
+        min_callchain_hits = self->stats.total_period * (callchain_param.min_percent / 100);
 
         tmp = RB_ROOT;
         next = rb_first(&self->entries);
@@ -525,7 +525,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size,
 
         if (pair_hists) {
                 count = self->pair ? self->pair->count : 0;
-                total = pair_hists->stats.total;
+                total = pair_hists->stats.total_period;
                 count_sys = self->pair ? self->pair->count_sys : 0;
                 count_us = self->pair ? self->pair->count_us : 0;
                 count_guest_sys = self->pair ? self->pair->count_guest_sys : 0;
@@ -769,10 +769,10 @@ print_entries:
                         ++position;
                 }
                 ret += hist_entry__fprintf(h, pair, show_displacement,
-                                           displacement, fp, self->stats.total);
+                                           displacement, fp, self->stats.total_period);
 
                 if (symbol_conf.use_callchain)
-                        ret += hist_entry__fprintf_callchain(h, fp, self->stats.total);
+                        ret += hist_entry__fprintf_callchain(h, fp, self->stats.total_period);
 
                 if (h->ms.map == NULL && verbose > 1) {
                         __map_groups__fprintf_maps(&h->thread->mg,
@@ -795,7 +795,7 @@ void hists__filter_by_dso(struct hists *self, const struct dso *dso)
 {
         struct rb_node *nd;
 
-        self->nr_entries = self->stats.total = 0;
+        self->nr_entries = self->stats.total_period = 0;
         self->max_sym_namelen = 0;
 
         for (nd = rb_first(&self->entries); nd; nd = rb_next(nd)) {
@@ -812,7 +812,7 @@ void hists__filter_by_dso(struct hists *self, const struct dso *dso)
                 h->filtered &= ~(1 << HIST_FILTER__DSO);
                 if (!h->filtered) {
                         ++self->nr_entries;
-                        self->stats.total += h->count;
+                        self->stats.total_period += h->count;
                         if (h->ms.sym &&
                             self->max_sym_namelen < h->ms.sym->namelen)
                                 self->max_sym_namelen = h->ms.sym->namelen;
@@ -824,7 +824,7 @@ void hists__filter_by_thread(struct hists *self, const struct thread *thread)
 {
         struct rb_node *nd;
 
-        self->nr_entries = self->stats.total = 0;
+        self->nr_entries = self->stats.total_period = 0;
         self->max_sym_namelen = 0;
 
         for (nd = rb_first(&self->entries); nd; nd = rb_next(nd)) {
@@ -837,7 +837,7 @@ void hists__filter_by_thread(struct hists *self, const struct thread *thread)
                 h->filtered &= ~(1 << HIST_FILTER__THREAD);
                 if (!h->filtered) {
                         ++self->nr_entries;
-                        self->stats.total += h->count;
+                        self->stats.total_period += h->count;
                         if (h->ms.sym &&
                             self->max_sym_namelen < h->ms.sym->namelen)
                                 self->max_sym_namelen = h->ms.sym->namelen;
@@ -1031,8 +1031,8 @@ int hist_entry__annotate(struct hist_entry *self, struct list_head *head)
 
 void hists__inc_nr_events(struct hists *self, u32 type)
 {
-        ++self->hists.stats.nr_events[0];
-        ++self->hists.stats.nr_events[type];
+        ++self->stats.nr_events[0];
+        ++self->stats.nr_events[type];
 }
 
 size_t hists__fprintf_nr_events(struct hists *self, FILE *fp)
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 97b8962ff69a..da6b84814a50 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -37,9 +37,21 @@ struct sym_priv {
         struct sym_ext  *ext;
 };
 
+/*
+ * The kernel collects the number of events it couldn't send in a stretch and
+ * when possible sends this number in a PERF_RECORD_LOST event. The number of
+ * such "chunks" of lost events is stored in .nr_events[PERF_EVENT_LOST] while
+ * total_lost tells exactly how many events the kernel in fact lost, i.e. it is
+ * the sum of all struct lost_event.lost fields reported.
+ *
+ * The total_period is needed because by default auto-freq is used, so
+ * multipling nr_events[PERF_EVENT_SAMPLE] by a frequency isn't possible to get
+ * the total number of low level events, it is necessary to to sum all struct
+ * sample_event.period and stash the result in total_period.
+ */
 struct events_stats {
-        u64 total;
-        u64 lost;
+        u64 total_period;
+        u64 total_lost;
         u32 nr_events[PERF_RECORD_HEADER_MAX];
         u32 nr_unknown_events;
 };
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index ba6acd04c082..010bacf40163 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -689,7 +689,7 @@ static int hist_browser__populate(struct hist_browser *self, struct hists *hists
         }
 
         snprintf(str, sizeof(str), "Samples: %Ld                            ",
-                 hists->stats.total);
+                 hists->stats.total_period);
         newtDrawRootText(0, 0, str);
 
         newtGetScreenSize(NULL, &rows);
@@ -718,12 +718,12 @@ static int hist_browser__populate(struct hist_browser *self, struct hists *hists
                 if (h->filtered)
                         continue;
 
-                len = hist_entry__append_browser(h, self->tree, hists->stats.total);
+                len = hist_entry__append_browser(h, self->tree, hists->stats.total_period);
                 if (len > max_len)
                         max_len = len;
                 if (symbol_conf.use_callchain)
                         hist_entry__append_callchain_browser(h, self->tree,
-                                                             hists->stats.total, idx++);
+                                                             hists->stats.total_period, idx++);
                 ++curr_hist;
                 if (curr_hist % 5)
                         ui_progress__update(progress, curr_hist);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7231f6b19fb4..25bfca4f10f0 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -549,7 +549,7 @@ static int perf_session__process_event(struct perf_session *self,
                 dump_printf("%#Lx [%#x]: PERF_RECORD_%s",
                             offset + head, event->header.size,
                             event__name[event->header.type]);
-                hists__inc_nr_events(self, event->header.type);
+                hists__inc_nr_events(&self->hists, event->header.type);
         }
 
         if (self->header.needs_swap && event__swap_ops[event->header.type])