perf hists: Introduce struct he_stat

The struct he_stat is for separating out statistics data of a hist
entry.  It is required for later changes.

It's just a mechanical change and should have no functional differences.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arun Sharma <asharma@fb.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1349354994-17853-8-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

6 files changed, 59 insertions, 51 deletions

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index d359795454d0..0568536ecf67 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -570,7 +570,7 @@ static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp,	\
                                              struct hist_entry *he)     \
 {                                                                       \
         struct hists *hists = he->hists;                                \
-        double percent = 100.0 * he->_field / hists->stats.total_period;\
+        double percent = 100.0 * he->stat._field / hists->stats.total_period; \
         *(double *)hpp->ptr = percent;                                  \
         return scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent);      \
 }
@@ -982,7 +982,7 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
                 folded_sign = hist_entry__folded(he);
 
         hist_entry__sort_snprintf(he, s, sizeof(s), browser->hists);
-        percent = (he->period * 100.0) / browser->hists->stats.total_period;
+        percent = (he->stat.period * 100.0) / browser->hists->stats.total_period;
 
         if (symbol_conf.use_callchain)
                 printed += fprintf(fp, "%c ", folded_sign);
@@ -990,10 +990,10 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
         printed += fprintf(fp, " %5.2f%%", percent);
 
         if (symbol_conf.show_nr_samples)
-                printed += fprintf(fp, " %11u", he->nr_events);
+                printed += fprintf(fp, " %11u", he->stat.nr_events);
 
         if (symbol_conf.show_total_period)
-                printed += fprintf(fp, " %12" PRIu64, he->period);
+                printed += fprintf(fp, " %12" PRIu64, he->stat.period);
 
         printed += fprintf(fp, "%s\n", rtrim(s));
 
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index 3cbb1d622ed2..4125c6284114 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -50,7 +50,7 @@ static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp,			\
                                          struct hist_entry *he)                 \
 {                                                                               \
         struct hists *hists = he->hists;                                        \
-        double percent = 100.0 * he->_field / hists->stats.total_period;        \
+        double percent = 100.0 * he->stat._field / hists->stats.total_period;   \
         const char *markup;                                                     \
         int ret = 0;                                                            \
                                                                                 \
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 7f043394bef1..f5a1e4f65263 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -19,7 +19,7 @@ static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
 }
@@ -27,7 +27,7 @@ static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -48,7 +48,7 @@ static int hpp__width_overhead_sys(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_sys / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
@@ -56,7 +56,7 @@ static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 static int hpp__entry_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_sys / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -77,7 +77,7 @@ static int hpp__width_overhead_us(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_us / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
@@ -85,7 +85,7 @@ static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 static int hpp__entry_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_us / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -105,7 +105,7 @@ static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_guest_sys / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
@@ -114,7 +114,7 @@ static int hpp__entry_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_guest_sys / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -134,7 +134,7 @@ static int hpp__color_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_guest_us / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
@@ -143,7 +143,7 @@ static int hpp__entry_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
         struct hists *hists = he->hists;
-        double percent = 100.0 * he->period_guest_us / hists->stats.total_period;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -167,7 +167,7 @@ static double baseline_percent(struct hist_entry *he)
 
         if (pair) {