perf top: Reuse the 'report' hist_entry/hists classes

This actually fixes several problems we had in the old 'perf top':

1. Unresolved symbols not show, limitation that came from the old
   "KernelTop" codebase, to solve it we would need to do changes
   that would make sym_entry have most of the hist_entry fields.
2. It was using the number of samples, not the sum of sample->period.

And brings the --sort code that allows us to have all the views in
'perf report', for instance:

[root@emilia ~]# perf top --sort dso
PerfTop: 5903 irqs/sec kernel:77.5% exact: 0.0% [1000Hz cycles], (all, 8 CPUs)
------------------------------------------------------------------------------

    31.59%  libcrypto.so.1.0.0
    21.55%  [kernel]
    18.57%  libpython2.6.so.1.0
     7.04%  libc-2.12.so
     6.99%  _backend_agg.so
     4.72%  sshd
     1.48%  multiarray.so
     1.39%  libfreetype.so.6.3.22
     1.37%  perf
     0.71%  libgobject-2.0.so.0.2200.5
     0.53%  [tg3]
     0.48%  libglib-2.0.so.0.2200.5
     0.44%  libstdc++.so.6.0.13
     0.40%  libcairo.so.2.10800.8
     0.38%  libm-2.12.so
     0.34%  umath.so
     0.30%  libgdk-x11-2.0.so.0.1800.9
     0.22%  libpthread-2.12.so
     0.20%  libgtk-x11-2.0.so.0.1800.9
     0.20%  librt-2.12.so
     0.15%  _path.so
     0.13%  libpango-1.0.so.0.2800.1
     0.11%  libatlas.so.3.0
     0.09%  ft2font.so
     0.09%  libpangoft2-1.0.so.0.2800.1
     0.08%  libX11.so.6.3.0
     0.07%  [vdso]
     0.06%  cyclictest
^C

All the filter lists can be used as well: --dsos, --comms, --symbols,
etc.

The 'perf report' TUI is also reused, being possible to apply all the
zoom operations, do annotation, etc.

This change will allow multiple simplifications in the symbol system as
well, that will be detailed in upcoming changesets.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-xzaaldxq7zhqrrxdxjifk1mh@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 2 insertions, 139 deletions

diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c
index a11f60735a18..500471dffa4f 100644
--- a/tools/perf/util/top.c
+++ b/tools/perf/util/top.c
@@ -15,52 +15,6 @@
 #include "top.h"
 #include <inttypes.h>
 
-/*
- * Ordering weight: count-1 * count-2 * ... / count-n
- */
-static double sym_weight(const struct sym_entry *sym, struct perf_top *top)
-{
-        double weight = sym->snap_count;
-        int counter;
-
-        if (!top->display_weighted)
-                return weight;
-
-        for (counter = 1; counter < top->evlist->nr_entries - 1; counter++)
-                weight *= sym->count[counter];
-
-        weight /= (sym->count[counter] + 1);
-
-        return weight;
-}
-
-static void perf_top__remove_active_sym(struct perf_top *top, struct sym_entry *syme)
-{
-        pthread_mutex_lock(&top->active_symbols_lock);
-        list_del_init(&syme->node);
-        pthread_mutex_unlock(&top->active_symbols_lock);
-}
-
-static void rb_insert_active_sym(struct rb_root *tree, struct sym_entry *se)
-{
-        struct rb_node **p = &tree->rb_node;
-        struct rb_node *parent = NULL;
-        struct sym_entry *iter;
-
-        while (*p != NULL) {
-                parent = *p;
-                iter = rb_entry(parent, struct sym_entry, rb_node);
-
-                if (se->weight > iter->weight)
-                        p = &(*p)->rb_left;
-                else
-                        p = &(*p)->rb_right;
-        }
-
-        rb_link_node(&se->rb_node, parent, p);
-        rb_insert_color(&se->rb_node, tree);
-}
-
 #define SNPRINTF(buf, size, fmt, args...) \
 ({ \
         size_t r = snprintf(buf, size, fmt, ## args); \
@@ -69,7 +23,6 @@ static void rb_insert_active_sym(struct rb_root *tree, struct sym_entry *se)
 
 size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)
 {
-        struct perf_evsel *counter;
         float samples_per_sec = top->samples / top->delay_secs;
         float ksamples_per_sec = top->kernel_samples / top->delay_secs;
         float esamples_percent = (100.0 * top->exact_samples) / top->samples;
@@ -104,7 +57,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)
                                esamples_percent);
         }
 
-        if (top->evlist->nr_entries == 1 || !top->display_weighted) {
+        if (top->evlist->nr_entries == 1) {
                 struct perf_evsel *first;
                 first = list_entry(top->evlist->entries.next, struct perf_evsel, node);
                 ret += SNPRINTF(bf + ret, size - ret, "%" PRIu64 "%s ",
@@ -112,27 +65,7 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)
                                 top->freq ? "Hz" : "");
         }
 
-        if (!top->display_weighted) {
-                ret += SNPRINTF(bf + ret, size - ret, "%s",
-                                event_name(top->sym_evsel));
-        } else {
-                /*
-                 * Don't let events eat all the space. Leaving 30 bytes
-                 * for the rest should be enough.
-                 */
-                size_t last_pos = size - 30;
-
-                list_for_each_entry(counter, &top->evlist->entries, node) {
-                        ret += SNPRINTF(bf + ret, size - ret, "%s%s",
-                                        counter->idx ? "/" : "",
-                                        event_name(counter));
-                        if (ret > last_pos) {
-                                sprintf(bf + last_pos - 3, "..");
-                                ret = last_pos - 1;
-                                break;
-                        }
-                }
-        }
+        ret += SNPRINTF(bf + ret, size - ret, "%s", event_name(top->sym_evsel));
 
         ret += SNPRINTF(bf + ret, size - ret, "], ");
 
@@ -166,73 +99,3 @@ void perf_top__reset_sample_counters(struct perf_top *top)
         top->exact_samples = top->guest_kernel_samples =
         top->guest_us_samples = 0;
 }
-
-float perf_top__decay_samples(struct perf_top *top, struct rb_root *root)
-{
-        struct sym_entry *syme, *n;
-        float sum_ksamples = 0.0;
-        int snap = !top->display_weighted ? top->sym_evsel->idx : 0, j;
-
-        /* Sort the active symbols */
-        pthread_mutex_lock(&top->active_symbols_lock);
-        syme = list_entry(top->active_symbols.next, struct sym_entry, node);
-        pthread_mutex_unlock(&top->active_symbols_lock);
-
-        top->rb_entries = 0;
-        list_for_each_entry_safe_from(syme, n, &top->active_symbols, node) {
-                syme->snap_count = syme->count[snap];
-                if (syme->snap_count != 0) {
-
-                        if ((top->hide_user_symbols &&
-                             syme->map->dso->kernel == DSO_TYPE_USER) ||
-                            (top->hide_kernel_symbols &&
-                             syme->map->dso->kernel == DSO_TYPE_KERNEL)) {
-                                perf_top__remove_active_sym(top, syme);
-                                continue;
-                        }
-                        syme->weight = sym_weight(syme, top);
-
-                        if ((int)syme->snap_count >= top->count_filter) {
-                                rb_insert_active_sym(root, syme);
-                                ++top->rb_entries;
-                        }
-                        sum_ksamples += syme->snap_count;
-
-                        for (j = 0; j < top->evlist->nr_entries; j++)
-                                syme->count[j] = top->zero ? 0 : syme->count[j] * 7 / 8;
-                } else
-                        perf_top__remove_active_sym(top, syme);
-        }
-
-        return sum_ksamples;
-}
-
-/*
- * Find the longest symbol name that will be displayed
- */
-void perf_top__find_widths(struct perf_top *top, struct rb_root *root,
-                           int *dso_width, int *dso_short_width, int *sym_width)
-{
-        struct rb_node *nd;
-        int printed = 0;
-
-        *sym_width = *dso_width = *dso_short_width = 0;
-
-        for (nd = rb_first(root); nd; nd = rb_next(nd)) {
-                struct sym_entry *syme = rb_entry(nd, struct sym_entry, rb_node);
-                struct symbol *sym = sym_entry__symbol(syme);
-
-                if (++printed > top->print_entries ||
-                    (int)syme->snap_count < top->count_filter)
-                        continue;
-
-                if (syme->map->dso->long_name_len > *dso_width)
-                        *dso_width = syme->map->dso->long_name_len;
-
-                if (syme->map->dso->short_name_len > *dso_short_width)
-                        *dso_short_width = syme->map->dso->short_name_len;
-
-                if (sym->namelen > *sym_width)
-                        *sym_width = sym->namelen;
-        }
-}