perf tools: Put common histogram functions in their own file

Move histogram related functions into their own files (hist.c and
hist.h) and make use of them in builtin-annotate.c and
builtin-report.c.

Signed-off-by: John Kacur <jkacur@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <alpine.LFD.2.00.0909281531180.8316@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 150 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 059c565b31ea..df516dce9540 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -23,6 +23,7 @@
 #include "util/parse-events.h"
 #include "util/thread.h"
 #include "util/sort.h"
+#include "util/hist.h"
 
 static char             const *input_name = "perf.data";
 
@@ -47,45 +48,6 @@ struct sym_ext {
         char            *path;
 };
 
-/*
- * histogram, sorted on item, collects counts
- */
-
-static struct rb_root hist;
-
-static int64_t
-hist_entry__cmp(struct hist_entry *left, struct hist_entry *right)
-{
-        struct sort_entry *se;
-        int64_t cmp = 0;
-
-        list_for_each_entry(se, &hist_entry__sort_list, list) {
-                cmp = se->cmp(left, right);
-                if (cmp)
-                        break;
-        }
-
-        return cmp;
-}
-
-static int64_t
-hist_entry__collapse(struct hist_entry *left, struct hist_entry *right)
-{
-        struct sort_entry *se;
-        int64_t cmp = 0;
-
-        list_for_each_entry(se, &hist_entry__sort_list, list) {
-                int64_t (*f)(struct hist_entry *, struct hist_entry *);
-
-                f = se->collapse ?: se->cmp;
-
-                cmp = f(left, right);
-                if (cmp)
-                        break;
-        }
-
-        return cmp;
-}
 
 /*
  * collect histogram counts
@@ -163,116 +125,6 @@ hist_entry__add(struct thread *thread, struct map *map, struct dso *dso,
         return 0;
 }
 
-static void hist_entry__free(struct hist_entry *he)
-{
-        free(he);
-}
-
-/*
- * collapse the histogram
- */
-
-static struct rb_root collapse_hists;
-
-static void collapse__insert_entry(struct hist_entry *he)
-{
-        struct rb_node **p = &collapse_hists.rb_node;
-        struct rb_node *parent = NULL;
-        struct hist_entry *iter;
-        int64_t cmp;
-
-        while (*p != NULL) {
-                parent = *p;
-                iter = rb_entry(parent, struct hist_entry, rb_node);
-
-                cmp = hist_entry__collapse(iter, he);
-
-                if (!cmp) {
-                        iter->count += he->count;
-                        hist_entry__free(he);
-                        return;
-                }
-
-                if (cmp < 0)
-                        p = &(*p)->rb_left;
-                else
-                        p = &(*p)->rb_right;
-        }
-
-        rb_link_node(&he->rb_node, parent, p);
-        rb_insert_color(&he->rb_node, &collapse_hists);
-}
-
-static void collapse__resort(void)
-{
-        struct rb_node *next;
-        struct hist_entry *n;
-
-        if (!sort__need_collapse)
-                return;
-
-        next = rb_first(&hist);
-        while (next) {
-                n = rb_entry(next, struct hist_entry, rb_node);
-                next = rb_next(&n->rb_node);
-
-                rb_erase(&n->rb_node, &hist);
-                collapse__insert_entry(n);
-        }
-}
-
-/*
- * reverse the map, sort on count.
- */
-
-static struct rb_root output_hists;
-
-static void output__insert_entry(struct hist_entry *he)
-{
-        struct rb_node **p = &output_hists.rb_node;
-        struct rb_node *parent = NULL;
-        struct hist_entry *iter;
-
-        while (*p != NULL) {
-                parent = *p;
-                iter = rb_entry(parent, struct hist_entry, rb_node);
-
-                if (he->count > iter->count)
-                        p = &(*p)->rb_left;
-                else
-                        p = &(*p)->rb_right;
-        }
-
-        rb_link_node(&he->rb_node, parent, p);
-        rb_insert_color(&he->rb_node, &output_hists);
-}
-
-static void output__resort(void)
-{
-        struct rb_node *next;
-        struct hist_entry *n;
-        struct rb_root *tree = &hist;
-
-        if (sort__need_collapse)
-                tree = &collapse_hists;
-
-        next = rb_first(tree);
-
-        while (next) {
-                n = rb_entry(next, struct hist_entry, rb_node);
-                next = rb_next(&n->rb_node);
-
-                rb_erase(&n->rb_node, tree);
-                output__insert_entry(n);
-        }
-}
-
-static unsigned long total = 0,
-                     total_mmap = 0,
-                     total_comm = 0,
-                     total_fork = 0,
-                     total_unknown = 0;
-
 static int
 process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 {
@@ -861,7 +713,7 @@ more:
                 dsos__fprintf(stdout);
 
         collapse__resort();
-        output__resort();
+        output__resort(total);
 
         find_annotations();