path: root/tools/perf/util/ui/browsers/hists.c
diff options
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-10-11 16:15:39 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-10-11 16:16:54 -0300
commit900e14a8f5a49e987790b93c7906989b22075f1b (patch)
tree384fefd278474a1e03ccc68efbf7ea92e393ee6f /tools/perf/util/ui/browsers/hists.c
parentMerge branch 'perf/core' of git://github.com/acmel/linux into perf/core (diff)
perf hists browser: Recalculate browser pointers after resort/decay
In browsers that access dynamic underlying data structures, like in the hists browser and its hist_entry rb_tree, we need to revalidate any reference to the underlying data structure, because they can have gone away, decayed. This fixes a problem where after a while the top entries get behind the top of the screen, i.e. the top_idx stays at 0, which means it is at the first entry in the rb_tree when in fact it wasn't because the browser->top didn't got revalidated after the timer ran and the underlying data structure got updated. 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-mhje66qssdko24q67a2lhlho@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to '')
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index e64d9527f14e..9ece84353538 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -332,13 +332,7 @@ static int hist_browser__run(struct hist_browser *self, const char *ev_name,
case -1:
/* FIXME we need to check if it was es.reason == NEWT_EXIT_TIMER */
- /*
- * The timer may have changed the number of entries.
- * XXX: Find better way to keep this in synch, probably
- * removing this timer function altogether and just sync
- * using the hists->lock...
- */
- self->b.nr_entries = self->hists->nr_entries;
+ ui_browser__update_nr_entries(&self->b, self->hists->nr_entries);
hists__browser_title(self->hists, title, sizeof(title),
ev_name, self->dso_filter,
@@ -985,6 +979,7 @@ do_annotate:
hist_entry__tui_annotate(he, evsel->idx, nr_events,
timer, arg, delay_secs);
+ ui_browser__update_nr_entries(&browser->b, browser->hists->nr_entries);
} else if (choice == browse_map)
else if (choice == zoom_dso) {