1 files changed, 31 insertions, 13 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 04de3387de3f..68265120ee07 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -138,8 +138,14 @@ static int add_event_total(struct perf_session *session,
         if (!hists)
                 return -ENOMEM;
 
-        hists->stats.total += data->period;
-        session->hists.stats.total += data->period;
+        hists->stats.total_period += data->period;
+        /*
+         * FIXME: add_event_total should be moved from here to
+         * perf_session__process_event so that the proper hist is passed to
+         * the event_op methods.
+         */
+        hists__inc_nr_events(hists, PERF_RECORD_SAMPLE);
+        session->hists.stats.total_period += data->period;
         return 0;
 }
 
@@ -182,14 +188,14 @@ static int process_sample_event(event_t *event, struct perf_session *session)
                 return 0;
 
         if (perf_session__add_hist_entry(session, &al, &data)) {
-                pr_debug("problem incrementing symbol count, skipping event\n");
+                pr_debug("problem incrementing symbol period, skipping event\n");
                 return -1;
         }
 
         attr = perf_header__find_attr(data.id, &session->header);
 
         if (add_event_total(session, &data, attr)) {
-                pr_debug("problem adding event count\n");
+                pr_debug("problem adding event period\n");
                 return -1;
         }
 
@@ -263,11 +269,25 @@ static struct perf_event_ops event_ops = {
 
 extern volatile int session_done;
 
-static void sig_handler(int sig __attribute__((__unused__)))
+static void sig_handler(int sig __used)
 {
         session_done = 1;
 }
 
+static size_t hists__fprintf_nr_sample_events(struct hists *self,
+                                              const char *evname, FILE *fp)
+{
+        size_t ret;
+        char unit;
+        unsigned long nr_events = self->stats.nr_events[PERF_RECORD_SAMPLE];
+
+        nr_events = convert_unit(nr_events, &unit);
+        ret = fprintf(fp, "# Events: %lu%c", nr_events, unit);
+        if (evname != NULL)
+                ret += fprintf(fp, " %s", evname);
+        return ret + fprintf(fp, "\n#\n");
+}
+
 static int __cmd_report(void)
 {
         int ret = -EINVAL;
@@ -293,7 +313,7 @@ static int __cmd_report(void)
                 goto out_delete;
 
         if (dump_trace) {
-                event__print_totals();
+                perf_session__fprintf_nr_events(session, stdout);
                 goto out_delete;
         }
 
@@ -313,14 +333,12 @@ static int __cmd_report(void)
                 if (use_browser)
                         hists__browse(hists, help, input_name);
                 else {
-                        if (rb_first(&session->hists.entries) ==
+                        const char *evname = NULL;
+                        if (rb_first(&session->hists.entries) !=
                             rb_last(&session->hists.entries))
-                                fprintf(stdout, "# Samples: %Ld\n#\n",
-                                        hists->stats.total);
-                        else
-                                fprintf(stdout, "# Samples: %Ld %s\n#\n",
-                                        hists->stats.total,
-                                        __event_name(hists->type, hists->config));
+                                evname = __event_name(hists->type, hists->config);
+
+                        hists__fprintf_nr_sample_events(hists, evname, stdout);
 
                         hists__fprintf(hists, NULL, false, stdout);
                         fprintf(stdout, "\n\n");