perf top: Remove entries from entries_collapsed on decay

We were removing only when using a --sort order that needs collapsing,
while we also use it in the threaded case, causing memory corruption
because we were scribbling freed hist entries, oops.

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-k16fb4jsulr7x0ixv43amb6d@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index de3cb1e00f9e..e211304a0dd7 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -304,7 +304,7 @@ static void print_sym_table(void)
 
         hists__collapse_resort_threaded(&top.sym_evsel->hists);
         hists__output_resort_threaded(&top.sym_evsel->hists);
-        hists__decay_entries(&top.sym_evsel->hists);
+        hists__decay_entries_threaded(&top.sym_evsel->hists);
         hists__output_recalc_col_len(&top.sym_evsel->hists, winsize.ws_row - 3);
         putchar('\n');
         hists__fprintf(&top.sym_evsel->hists, NULL, false, false,
@@ -555,7 +555,7 @@ static void perf_top__sort_new_samples(void *arg)
 
         hists__collapse_resort_threaded(&t->sym_evsel->hists);
         hists__output_resort_threaded(&t->sym_evsel->hists);
-        hists__decay_entries(&t->sym_evsel->hists);
+        hists__decay_entries_threaded(&t->sym_evsel->hists);
         hists__output_recalc_col_len(&t->sym_evsel->hists, winsize.ws_row - 3);
 }