perf hists: Move he->stat.nr_events initialization to a template
[deliverable/linux.git] / tools / perf / util / hist.c
index 514e2a4b367d6d53838d9ac726a063b0ba3bf5e8..02476cb3167d27d5807d39ad4e382173d1174b5a 100644 (file)
@@ -45,7 +45,7 @@ bool hists__new_col_len(struct hists *hists, enum hist_column col, u16 len)
        return false;
 }
 
-static void hists__reset_col_len(struct hists *hists)
+void hists__reset_col_len(struct hists *hists)
 {
        enum hist_column col;
 
@@ -63,7 +63,7 @@ static void hists__set_unres_dso_col_len(struct hists *hists, int dso)
                hists__set_col_len(hists, dso, unresolved_col_width);
 }
 
-static void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
+void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
 {
        const unsigned int unresolved_col_width = BITS_PER_LONG / 4;
        u16 len;
@@ -114,21 +114,37 @@ static void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
        }
 }
 
+void hists__output_recalc_col_len(struct hists *hists, int max_rows)
+{
+       struct rb_node *next = rb_first(&hists->entries);
+       struct hist_entry *n;
+       int row = 0;
+
+       hists__reset_col_len(hists);
+
+       while (next && row++ < max_rows) {
+               n = rb_entry(next, struct hist_entry, rb_node);
+               if (!n->filtered)
+                       hists__calc_col_len(hists, n);
+               next = rb_next(&n->rb_node);
+       }
+}
+
 static void hist_entry__add_cpumode_period(struct hist_entry *he,
                                           unsigned int cpumode, u64 period)
 {
        switch (cpumode) {
        case PERF_RECORD_MISC_KERNEL:
-               he->period_sys += period;
+               he->stat.period_sys += period;
                break;
        case PERF_RECORD_MISC_USER:
-               he->period_us += period;
+               he->stat.period_us += period;
                break;
        case PERF_RECORD_MISC_GUEST_KERNEL:
-               he->period_guest_sys += period;
+               he->stat.period_guest_sys += period;
                break;
        case PERF_RECORD_MISC_GUEST_USER:
-               he->period_guest_us += period;
+               he->stat.period_guest_us += period;
                break;
        default:
                break;
@@ -137,13 +153,13 @@ static void hist_entry__add_cpumode_period(struct hist_entry *he,
 
 static void hist_entry__decay(struct hist_entry *he)
 {
-       he->period = (he->period * 7) / 8;
-       he->nr_events = (he->nr_events * 7) / 8;
+       he->stat.period = (he->stat.period * 7) / 8;
+       he->stat.nr_events = (he->stat.nr_events * 7) / 8;
 }
 
 static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
 {
-       u64 prev_period = he->period;
+       u64 prev_period = he->stat.period;
 
        if (prev_period == 0)
                return true;
@@ -151,9 +167,9 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
        hist_entry__decay(he);
 
        if (!he->filtered)
-               hists->stats.total_period -= prev_period - he->period;
+               hists->stats.total_period -= prev_period - he->stat.period;
 
-       return he->period == 0;
+       return he->stat.period == 0;
 }
 
 static void __hists__decay_entries(struct hists *hists, bool zap_user,
@@ -207,7 +223,7 @@ static struct hist_entry *hist_entry__new(struct hist_entry *template)
 
        if (he != NULL) {
                *he = *template;
-               he->nr_events = 1;
+
                if (he->ms.map)
                        he->ms.map->referenced = true;
                if (symbol_conf.use_callchain)
@@ -222,7 +238,7 @@ static void hists__inc_nr_entries(struct hists *hists, struct hist_entry *h)
        if (!h->filtered) {
                hists__calc_col_len(hists, h);
                ++hists->nr_entries;
-               hists->stats.total_period += h->period;
+               hists->stats.total_period += h->stat.period;
        }
 }
 
@@ -254,8 +270,8 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
                cmp = hist_entry__cmp(entry, he);
 
                if (!cmp) {
-                       he->period += period;
-                       ++he->nr_events;
+                       he->stat.period += period;
+                       ++he->stat.nr_events;
 
                        /* If the map of an existing hist_entry has
                         * become out-of-date due to an exec() or
@@ -305,10 +321,14 @@ struct hist_entry *__hists__add_branch_entry(struct hists *self,
                .cpu    = al->cpu,
                .ip     = bi->to.addr,
                .level  = al->level,
-               .period = period,
+               .stat = {
+                       .period = period,
+                       .nr_events = 1,
+               },
                .parent = sym_parent,
                .filtered = symbol__parent_filter(sym_parent),
                .branch_info = bi,
+               .hists  = self,
        };
 
        return add_hist_entry(self, &entry, al, period);
@@ -327,9 +347,13 @@ struct hist_entry *__hists__add_entry(struct hists *self,
                .cpu    = al->cpu,
                .ip     = al->addr,
                .level  = al->level,
-               .period = period,
+               .stat = {
+                       .period = period,
+                       .nr_events = 1,
+               },
                .parent = sym_parent,
                .filtered = symbol__parent_filter(sym_parent),
+               .hists  = self,
        };
 
        return add_hist_entry(self, &entry, al, period);
@@ -378,7 +402,7 @@ void hist_entry__free(struct hist_entry *he)
  * collapse the histogram
  */
 
-static bool hists__collapse_insert_entry(struct hists *hists __used,
+static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,
                                         struct rb_root *root,
                                         struct hist_entry *he)
 {
@@ -394,8 +418,13 @@ static bool hists__collapse_insert_entry(struct hists *hists __used,
                cmp = hist_entry__collapse(iter, he);
 
                if (!cmp) {
-                       iter->period += he->period;
-                       iter->nr_events += he->nr_events;
+                       iter->stat.period               += he->stat.period;
+                       iter->stat.period_sys           += he->stat.period_sys;
+                       iter->stat.period_us            += he->stat.period_us;
+                       iter->stat.period_guest_sys     += he->stat.period_guest_sys;
+                       iter->stat.period_guest_us      += he->stat.period_guest_us;
+                       iter->stat.nr_events            += he->stat.nr_events;
+
                        if (symbol_conf.use_callchain) {
                                callchain_cursor_reset(&callchain_cursor);
                                callchain_merge(&callchain_cursor,
@@ -497,7 +526,7 @@ static void __hists__insert_output_entry(struct rb_root *entries,
                parent = *p;
                iter = rb_entry(parent, struct hist_entry, rb_node);
 
-               if (he->period > iter->period)
+               if (he->stat.period > iter->stat.period)
                        p = &(*p)->rb_left;
                else
                        p = &(*p)->rb_right;
@@ -547,671 +576,6 @@ void hists__output_resort_threaded(struct hists *hists)
        return __hists__output_resort(hists, true);
 }
 
-static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
-{
-       int i;
-       int ret = fprintf(fp, "            ");
-
-       for (i = 0; i < left_margin; i++)
-               ret += fprintf(fp, " ");
-
-       return ret;
-}
-
-static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
-                                         int left_margin)
-{
-       int i;
-       size_t ret = callchain__fprintf_left_margin(fp, left_margin);
-
-       for (i = 0; i < depth; i++)
-               if (depth_mask & (1 << i))
-                       ret += fprintf(fp, "|          ");
-               else
-                       ret += fprintf(fp, "           ");
-
-       ret += fprintf(fp, "\n");
-
-       return ret;
-}
-
-static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain,
-                                    int depth, int depth_mask, int period,
-                                    u64 total_samples, u64 hits,
-                                    int left_margin)
-{
-       int i;
-       size_t ret = 0;
-
-       ret += callchain__fprintf_left_margin(fp, left_margin);
-       for (i = 0; i < depth; i++) {
-               if (depth_mask & (1 << i))
-                       ret += fprintf(fp, "|");
-               else
-                       ret += fprintf(fp, " ");
-               if (!period && i == depth - 1) {
-                       double percent;
-
-                       percent = hits * 100.0 / total_samples;
-                       ret += percent_color_fprintf(fp, "--%2.2f%%-- ", percent);
-               } else
-                       ret += fprintf(fp, "%s", "          ");
-       }
-       if (chain->ms.sym)
-               ret += fprintf(fp, "%s\n", chain->ms.sym->name);
-       else
-               ret += fprintf(fp, "0x%0" PRIx64 "\n", chain->ip);
-
-       return ret;
-}
-
-static struct symbol *rem_sq_bracket;
-static struct callchain_list rem_hits;
-
-static void init_rem_hits(void)
-{
-       rem_sq_bracket = malloc(sizeof(*rem_sq_bracket) + 6);
-       if (!rem_sq_bracket) {
-               fprintf(stderr, "Not enough memory to display remaining hits\n");
-               return;
-       }
-
-       strcpy(rem_sq_bracket->name, "[...]");
-       rem_hits.ms.sym = rem_sq_bracket;
-}
-
-static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root,
-                                        u64 total_samples, int depth,
-                                        int depth_mask, int left_margin)
-{
-       struct rb_node *node, *next;
-       struct callchain_node *child;
-       struct callchain_list *chain;
-       int new_depth_mask = depth_mask;
-       u64 remaining;
-       size_t ret = 0;
-       int i;
-       uint entries_printed = 0;
-
-       remaining = total_samples;
-
-       node = rb_first(root);
-       while (node) {
-               u64 new_total;
-               u64 cumul;
-
-               child = rb_entry(node, struct callchain_node, rb_node);
-               cumul = callchain_cumul_hits(child);
-               remaining -= cumul;
-
-               /*
-                * The depth mask manages the output of pipes that show
-                * the depth. We don't want to keep the pipes of the current
-                * level for the last child of this depth.
-                * Except if we have remaining filtered hits. They will
-                * supersede the last child
-                */
-               next = rb_next(node);
-               if (!next && (callchain_param.mode != CHAIN_GRAPH_REL || !remaining))
-                       new_depth_mask &= ~(1 << (depth - 1));
-
-               /*
-                * But we keep the older depth mask for the line separator
-                * to keep the level link until we reach the last child
-                */
-               ret += ipchain__fprintf_graph_line(fp, depth, depth_mask,
-                                                  left_margin);
-               i = 0;
-               list_for_each_entry(chain, &child->val, list) {
-                       ret += ipchain__fprintf_graph(fp, chain, depth,
-                                                     new_depth_mask, i++,
-                                                     total_samples,
-                                                     cumul,
-                                                     left_margin);
-               }
-
-               if (callchain_param.mode == CHAIN_GRAPH_REL)
-                       new_total = child->children_hit;
-               else
-                       new_total = total_samples;
-
-               ret += __callchain__fprintf_graph(fp, &child->rb_root, new_total,
-                                                 depth + 1,
-                                                 new_depth_mask | (1 << depth),
-                                                 left_margin);
-               node = next;
-               if (++entries_printed == callchain_param.print_limit)
-                       break;
-       }
-
-       if (callchain_param.mode == CHAIN_GRAPH_REL &&
-               remaining && remaining != total_samples) {
-
-               if (!rem_sq_bracket)
-                       return ret;
-
-               new_depth_mask &= ~(1 << (depth - 1));
-               ret += ipchain__fprintf_graph(fp, &rem_hits, depth,
-                                             new_depth_mask, 0, total_samples,
-                                             remaining, left_margin);
-       }
-
-       return ret;
-}
-
-static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
-                                      u64 total_samples, int left_margin)
-{
-       struct callchain_node *cnode;
-       struct callchain_list *chain;
-       u32 entries_printed = 0;
-       bool printed = false;
-       struct rb_node *node;
-       int i = 0;
-       int ret;
-
-       /*
-        * If have one single callchain root, don't bother printing
-        * its percentage (100 % in fractal mode and the same percentage
-        * than the hist in graph mode). This also avoid one level of column.
-        */
-       node = rb_first(root);
-       if (node && !rb_next(node)) {
-               cnode = rb_entry(node, struct callchain_node, rb_node);
-               list_for_each_entry(chain, &cnode->val, list) {
-                       /*
-                        * If we sort by symbol, the first entry is the same than
-                        * the symbol. No need to print it otherwise it appears as
-                        * displayed twice.
-                        */
-                       if (!i++ && sort__first_dimension == SORT_SYM)
-                               continue;
-                       if (!printed) {
-                               ret += callchain__fprintf_left_margin(fp, left_margin);
-                               ret += fprintf(fp, "|\n");
-                               ret += callchain__fprintf_left_margin(fp, left_margin);
-                               ret += fprintf(fp, "---");
-                               left_margin += 3;
-                               printed = true;
-                       } else
-                               ret += callchain__fprintf_left_margin(fp, left_margin);
-
-                       if (chain->ms.sym)
-                               ret += fprintf(fp, " %s\n", chain->ms.sym->name);
-                       else
-                               ret += fprintf(fp, " %p\n", (void *)(long)chain->ip);
-
-                       if (++entries_printed == callchain_param.print_limit)
-                               break;
-               }
-               root = &cnode->rb_root;
-       }
-
-       return __callchain__fprintf_graph(fp, root, total_samples,
-                                         1, 1, left_margin);
-}
-
-static size_t __callchain__fprintf_flat(FILE *fp,
-                                       struct callchain_node *self,
-                                       u64 total_samples)
-{
-       struct callchain_list *chain;
-       size_t ret = 0;
-
-       if (!self)
-               return 0;
-
-       ret += __callchain__fprintf_flat(fp, self->parent, total_samples);
-
-
-       list_for_each_entry(chain, &self->val, list) {
-               if (chain->ip >= PERF_CONTEXT_MAX)
-                       continue;
-               if (chain->ms.sym)
-                       ret += fprintf(fp, "                %s\n", chain->ms.sym->name);
-               else
-                       ret += fprintf(fp, "                %p\n",
-                                       (void *)(long)chain->ip);
-       }
-
-       return ret;
-}
-
-static size_t callchain__fprintf_flat(FILE *fp, struct rb_root *self,
-                                     u64 total_samples)
-{
-       size_t ret = 0;
-       u32 entries_printed = 0;
-       struct rb_node *rb_node;
-       struct callchain_node *chain;
-
-       rb_node = rb_first(self);
-       while (rb_node) {
-               double percent;
-
-               chain = rb_entry(rb_node, struct callchain_node, rb_node);
-               percent = chain->hit * 100.0 / total_samples;
-
-               ret = percent_color_fprintf(fp, "           %6.2f%%\n", percent);
-               ret += __callchain__fprintf_flat(fp, chain, total_samples);
-               ret += fprintf(fp, "\n");
-               if (++entries_printed == callchain_param.print_limit)
-                       break;
-
-               rb_node = rb_next(rb_node);
-       }
-
-       return ret;
-}
-
-static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
-                                           u64 total_samples, int left_margin,
-                                           FILE *fp)
-{
-       switch (callchain_param.mode) {
-       case CHAIN_GRAPH_REL:
-               return callchain__fprintf_graph(fp, &he->sorted_chain, he->period,
-                                               left_margin);
-               break;
-       case CHAIN_GRAPH_ABS:
-               return callchain__fprintf_graph(fp, &he->sorted_chain, total_samples,
-                                               left_margin);
-               break;
-       case CHAIN_FLAT:
-               return callchain__fprintf_flat(fp, &he->sorted_chain, total_samples);
-               break;
-       case CHAIN_NONE:
-               break;
-       default:
-               pr_err("Bad callchain mode\n");
-       }
-
-       return 0;
-}
-
-void hists__output_recalc_col_len(struct hists *hists, int max_rows)
-{
-       struct rb_node *next = rb_first(&hists->entries);
-       struct hist_entry *n;
-       int row = 0;
-
-       hists__reset_col_len(hists);
-
-       while (next && row++ < max_rows) {
-               n = rb_entry(next, struct hist_entry, rb_node);
-               if (!n->filtered)
-                       hists__calc_col_len(hists, n);
-               next = rb_next(&n->rb_node);
-       }
-}
-
-static int hist_entry__pcnt_snprintf(struct hist_entry *he, char *s,
-                                    size_t size, struct hists *pair_hists,
-                                    bool show_displacement, long displacement,
-                                    bool color, u64 total_period)
-{
-       u64 period, total, period_sys, period_us, period_guest_sys, period_guest_us;
-       u64 nr_events;
-       const char *sep = symbol_conf.field_sep;
-       int ret;
-
-       if (symbol_conf.exclude_other && !he->parent)
-               return 0;
-
-       if (pair_hists) {
-               period = he->pair ? he->pair->period : 0;
-               nr_events = he->pair ? he->pair->nr_events : 0;
-               total = pair_hists->stats.total_period;
-               period_sys = he->pair ? he->pair->period_sys : 0;
-               period_us = he->pair ? he->pair->period_us : 0;
-               period_guest_sys = he->pair ? he->pair->period_guest_sys : 0;
-               period_guest_us = he->pair ? he->pair->period_guest_us : 0;
-       } else {
-               period = he->period;
-               nr_events = he->nr_events;
-               total = total_period;
-               period_sys = he->period_sys;
-               period_us = he->period_us;
-               period_guest_sys = he->period_guest_sys;
-               period_guest_us = he->period_guest_us;
-       }
-
-       if (total) {
-               if (color)
-                       ret = percent_color_snprintf(s, size,
-                                                    sep ? "%.2f" : "   %6.2f%%",
-                                                    (period * 100.0) / total);
-               else
-                       ret = scnprintf(s, size, sep ? "%.2f" : "   %6.2f%%",
-                                      (period * 100.0) / total);
-               if (symbol_conf.show_cpu_utilization) {
-                       ret += percent_color_snprintf(s + ret, size - ret,
-                                       sep ? "%.2f" : "   %6.2f%%",
-                                       (period_sys * 100.0) / total);
-                       ret += percent_color_snprintf(s + ret, size - ret,
-                                       sep ? "%.2f" : "   %6.2f%%",
-                                       (period_us * 100.0) / total);
-                       if (perf_guest) {
-                               ret += percent_color_snprintf(s + ret,
-                                               size - ret,
-                                               sep ? "%.2f" : "   %6.2f%%",
-                                               (period_guest_sys * 100.0) /
-                                                               total);
-                               ret += percent_color_snprintf(s + ret,
-                                               size - ret,
-                                               sep ? "%.2f" : "   %6.2f%%",
-                                               (period_guest_us * 100.0) /
-                                                               total);
-                       }
-               }
-       } else
-               ret = scnprintf(s, size, sep ? "%" PRIu64 : "%12" PRIu64 " ", period);
-
-       if (symbol_conf.show_nr_samples) {
-               if (sep)
-                       ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, nr_events);
-               else
-                       ret += scnprintf(s + ret, size - ret, "%11" PRIu64, nr_events);
-       }
-
-       if (symbol_conf.show_total_period) {
-               if (sep)
-                       ret += scnprintf(s + ret, size - ret, "%c%" PRIu64, *sep, period);
-               else
-                       ret += scnprintf(s + ret, size - ret, " %12" PRIu64, period);
-       }
-
-       if (pair_hists) {
-               char bf[32];
-               double old_percent = 0, new_percent = 0, diff;
-
-               if (total > 0)
-                       old_percent = (period * 100.0) / total;
-               if (total_period > 0)
-                       new_percent = (he->period * 100.0) / total_period;
-
-               diff = new_percent - old_percent;
-
-               if (fabs(diff) >= 0.01)
-                       scnprintf(bf, sizeof(bf), "%+4.2F%%", diff);
-               else
-                       scnprintf(bf, sizeof(bf), " ");
-
-               if (sep)
-                       ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
-               else
-                       ret += scnprintf(s + ret, size - ret, "%11.11s", bf);
-
-               if (show_displacement) {
-                       if (displacement)
-                               scnprintf(bf, sizeof(bf), "%+4ld", displacement);
-                       else
-                               scnprintf(bf, sizeof(bf), " ");
-
-                       if (sep)
-                               ret += scnprintf(s + ret, size - ret, "%c%s", *sep, bf);
-                       else
-                               ret += scnprintf(s + ret, size - ret, "%6.6s", bf);
-               }
-       }
-
-       return ret;
-}
-
-int hist_entry__snprintf(struct hist_entry *he, char *s, size_t size,
-                        struct hists *hists)
-{
-       const char *sep = symbol_conf.field_sep;
-       struct sort_entry *se;
-       int ret = 0;
-
-       list_for_each_entry(se, &hist_entry__sort_list, list) {
-               if (se->elide)
-                       continue;
-
-               ret += scnprintf(s + ret, size - ret, "%s", sep ?: "  ");
-               ret += se->se_snprintf(he, s + ret, size - ret,
-                                      hists__col_len(hists, se->se_width_idx));
-       }
-
-       return ret;
-}
-
-static int hist_entry__fprintf(struct hist_entry *he, size_t size,
-                              struct hists *hists, struct hists *pair_hists,
-                              bool show_displacement, long displacement,
-                              u64 total_period, FILE *fp)
-{
-       char bf[512];
-       int ret;
-
-       if (size == 0 || size > sizeof(bf))
-               size = sizeof(bf);
-
-       ret = hist_entry__pcnt_snprintf(he, bf, size, pair_hists,
-                                       show_displacement, displacement,
-                                       true, total_period);
-       hist_entry__snprintf(he, bf + ret, size - ret, hists);
-       return fprintf(fp, "%s\n", bf);
-}
-
-static size_t hist_entry__fprintf_callchain(struct hist_entry *he,
-                                           struct hists *hists,
-                                           u64 total_period, FILE *fp)
-{
-       int left_margin = 0;
-
-       if (sort__first_dimension == SORT_COMM) {
-               struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
-                                                        typeof(*se), list);
-               left_margin = hists__col_len(hists, se->se_width_idx);
-               left_margin -= thread__comm_len(he->thread);
-       }
-
-       return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
-}
-
-size_t hists__fprintf(struct hists *hists, struct hists *pair,
-                     bool show_displacement, bool show_header, int max_rows,
-                     int max_cols, FILE *fp)
-{
-       struct sort_entry *se;
-       struct rb_node *nd;
-       size_t ret = 0;
-       u64 total_period;
-       unsigned long position = 1;
-       long displacement = 0;
-       unsigned int width;
-       const char *sep = symbol_conf.field_sep;
-       const char *col_width = symbol_conf.col_width_list_str;
-       int nr_rows = 0;
-
-       init_rem_hits();
-
-       if (!show_header)
-               goto print_entries;
-
-       fprintf(fp, "# %s", pair ? "Baseline" : "Overhead");
-
-       if (symbol_conf.show_cpu_utilization) {
-               if (sep) {
-                       ret += fprintf(fp, "%csys", *sep);
-                       ret += fprintf(fp, "%cus", *sep);
-                       if (perf_guest) {
-                               ret += fprintf(fp, "%cguest sys", *sep);
-                               ret += fprintf(fp, "%cguest us", *sep);
-                       }
-               } else {
-                       ret += fprintf(fp, "     sys  ");
-                       ret += fprintf(fp, "      us  ");
-                       if (perf_guest) {
-                               ret += fprintf(fp, "  guest sys  ");
-                               ret += fprintf(fp, "  guest us  ");
-                       }
-               }
-       }
-
-       if (symbol_conf.show_nr_samples) {
-               if (sep)
-                       fprintf(fp, "%cSamples", *sep);
-               else
-                       fputs("  Samples  ", fp);
-       }
-
-       if (symbol_conf.show_total_period) {
-               if (sep)
-                       ret += fprintf(fp, "%cPeriod", *sep);
-               else
-                       ret += fprintf(fp, "   Period    ");
-       }
-
-       if (pair) {
-               if (sep)
-                       ret += fprintf(fp, "%cDelta", *sep);
-               else
-                       ret += fprintf(fp, "  Delta    ");
-
-               if (show_displacement) {
-                       if (sep)
-                               ret += fprintf(fp, "%cDisplacement", *sep);
-                       else
-                               ret += fprintf(fp, " Displ");
-               }
-       }
-
-       list_for_each_entry(se, &hist_entry__sort_list, list) {
-               if (se->elide)
-                       continue;
-               if (sep) {
-                       fprintf(fp, "%c%s", *sep, se->se_header);
-                       continue;
-               }
-               width = strlen(se->se_header);
-               if (symbol_conf.col_width_list_str) {
-                       if (col_width) {
-                               hists__set_col_len(hists, se->se_width_idx,
-                                                  atoi(col_width));
-                               col_width = strchr(col_width, ',');
-                               if (col_width)
-                                       ++col_width;
-                       }
-               }
-               if (!hists__new_col_len(hists, se->se_width_idx, width))
-                       width = hists__col_len(hists, se->se_width_idx);
-               fprintf(fp, "  %*s", width, se->se_header);
-       }
-
-       fprintf(fp, "\n");
-       if (max_rows && ++nr_rows >= max_rows)
-               goto out;
-
-       if (sep)
-               goto print_entries;
-
-       fprintf(fp, "# ........");
-       if (symbol_conf.show_cpu_utilization)
-               fprintf(fp, "   .......   .......");
-       if (symbol_conf.show_nr_samples)
-               fprintf(fp, " ..........");
-       if (symbol_conf.show_total_period)
-               fprintf(fp, " ............");
-       if (pair) {
-               fprintf(fp, " ..........");
-               if (show_displacement)
-                       fprintf(fp, " .....");
-       }
-       list_for_each_entry(se, &hist_entry__sort_list, list) {
-               unsigned int i;
-
-               if (se->elide)
-                       continue;
-
-               fprintf(fp, "  ");
-               width = hists__col_len(hists, se->se_width_idx);
-               if (width == 0)
-                       width = strlen(se->se_header);
-               for (i = 0; i < width; i++)
-                       fprintf(fp, ".");
-       }
-
-       fprintf(fp, "\n");
-       if (max_rows && ++nr_rows >= max_rows)
-               goto out;
-
-       fprintf(fp, "#\n");
-       if (max_rows && ++nr_rows >= max_rows)
-               goto out;
-
-print_entries:
-       total_period = hists->stats.total_period;
-
-       for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
-               struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
-
-               if (h->filtered)
-                       continue;
-
-               if (show_displacement) {
-                       if (h->pair != NULL)
-                               displacement = ((long)h->pair->position -
-                                               (long)position);
-                       else
-                               displacement = 0;
-                       ++position;
-               }
-               ret += hist_entry__fprintf(h, max_cols, hists, pair, show_displacement,
-                                          displacement, total_period, fp);
-
-               if (symbol_conf.use_callchain)
-                       ret += hist_entry__fprintf_callchain(h, hists, total_period, fp);
-               if (max_rows && ++nr_rows >= max_rows)
-                       goto out;
-
-               if (h->ms.map == NULL && verbose > 1) {
-                       __map_groups__fprintf_maps(&h->thread->mg,
-                                                  MAP__FUNCTION, verbose, fp);
-                       fprintf(fp, "%.10s end\n", graph_dotted_line);
-               }
-       }
-out:
-       free(rem_sq_bracket);
-
-       return ret;
-}
-
-/*
- * See hists__fprintf to match the column widths
- */
-unsigned int hists__sort_list_width(struct hists *hists)
-{
-       struct sort_entry *se;
-       int ret = 9; /* total % */
-
-       if (symbol_conf.show_cpu_utilization) {
-               ret += 7; /* count_sys % */
-               ret += 6; /* count_us % */
-               if (perf_guest) {
-                       ret += 13; /* count_guest_sys % */
-                       ret += 12; /* count_guest_us % */
-               }
-       }
-
-       if (symbol_conf.show_nr_samples)
-               ret += 11;
-
-       if (symbol_conf.show_total_period)
-               ret += 13;
-
-       list_for_each_entry(se, &hist_entry__sort_list, list)
-               if (!se->elide)
-                       ret += 2 + hists__col_len(hists, se->se_width_idx);
-
-       if (verbose) /* Addr + origin */
-               ret += 3 + BITS_PER_LONG / 4;
-
-       return ret;
-}
-
 static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h,
                                       enum hist_filter filter)
 {
@@ -1223,8 +587,8 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h
        if (h->ms.unfolded)
                hists->nr_entries += h->nr_rows;
        h->row_offset = 0;
-       hists->stats.total_period += h->period;
-       hists->stats.nr_events[PERF_RECORD_SAMPLE] += h->nr_events;
+       hists->stats.total_period += h->stat.period;
+       hists->stats.nr_events[PERF_RECORD_SAMPLE] += h->stat.nr_events;
 
        hists__calc_col_len(hists, h);
 }
@@ -1339,25 +703,3 @@ void hists__inc_nr_events(struct hists *hists, u32 type)
        ++hists->stats.nr_events[0];
        ++hists->stats.nr_events[type];
 }
-
-size_t hists__fprintf_nr_events(struct hists *hists, FILE *fp)
-{
-       int i;
-       size_t ret = 0;
-
-       for (i = 0; i < PERF_RECORD_HEADER_MAX; ++i) {
-               const char *name;
-
-               if (hists->stats.nr_events[i] == 0)
-                       continue;
-
-               name = perf_event__name(i);
-               if (!strcmp(name, "UNKNOWN"))
-                       continue;
-
-               ret += fprintf(fp, "%16s events: %10d\n", name,
-                              hists->stats.nr_events[i]);
-       }
-
-       return ret;
-}
This page took 0.036657 seconds and 5 git commands to generate.