perf hist: Introduce hists class and move lots of methods to it

In cbbc79a we introduced support for multiple events by introducing a
new "event_stat_id" struct and then made several perf_session methods
receive a point to it instead of a pointer to perf_session, and kept the
event_stats and hists rb_tree in perf_session.

While working on the new newt based browser, I realised that it would be
better to introduce a new class, "hists" (short for "histograms"),
renaming the "event_stat_id" struct and the perf_session methods that
were really "hists" methods, as they manipulate only struct hists
members, not touching anything in the other perf_session members.

Other optimizations, such as calculating the maximum lenght of a symbol
name present in an hists instance will be possible as we add them,
avoiding a re-traversal just for finding that information.

The rationale for the name "hists" to replace "event_stat_id" is that we
may have multiple sets of hists for the same event_stat id, as, for
instance, the 'perf diff' tool has, so event stat id is not what
characterizes what this struct and the functions that manipulate it do.

Cc: Eric B Munson <ebmunson@us.ibm.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index c7ac45a59ed5..3940964161b3 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -96,8 +96,7 @@ static int annotate__hist_hit(struct hist_entry *he, u64 ip)
         return 0;
 }
 
-static int perf_session__add_hist_entry(struct perf_session *self,
-                                        struct addr_location *al)
+static int hists__add_entry(struct hists *self, struct addr_location *al)
 {
         struct hist_entry *he;
 
@@ -112,7 +111,7 @@ static int perf_session__add_hist_entry(struct perf_session *self,
                 return 0;
         }
 
-        he = __perf_session__add_hist_entry(&self->hists, al, NULL, 1);
+        he = __hists__add_entry(self, al, NULL, 1);
         if (he == NULL)
                 return -ENOMEM;
 
@@ -132,7 +131,7 @@ static int process_sample_event(event_t *event, struct perf_session *session)
                 return -1;
         }
 
-        if (!al.filtered && perf_session__add_hist_entry(session, &al)) {
+        if (!al.filtered && hists__add_entry(&session->hists, &al)) {
                 pr_warning("problem incrementing symbol count, "
                            "skipping event\n");
                 return -1;
@@ -514,11 +513,11 @@ static void annotate_sym(struct hist_entry *he)
                 free_source_line(he, len);
 }
 
-static void perf_session__find_annotations(struct perf_session *self)
+static void hists__find_annotations(struct hists *self)
 {
         struct rb_node *nd;
 
-        for (nd = rb_first(&self->hists); nd; nd = rb_next(nd)) {
+        for (nd = rb_first(&self->entries); nd; nd = rb_next(nd)) {
                 struct hist_entry *he = rb_entry(nd, struct hist_entry, rb_node);
                 struct sym_priv *priv;
 
@@ -570,9 +569,9 @@ static int __cmd_annotate(void)
         if (verbose > 2)
                 perf_session__fprintf_dsos(session, stdout);
 
-        perf_session__collapse_resort(&session->hists);
-        perf_session__output_resort(&session->hists, session->event_total[0]);
-        perf_session__find_annotations(session);
+        hists__collapse_resort(&session->hists);
+        hists__output_resort(&session->hists);
+        hists__find_annotations(&session->hists);
 out_delete:
         perf_session__delete(session);