path: root/tools/perf/util/ui/browsers/hists.c
diff options
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-10-14 09:31:53 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-10-14 12:48:14 -0300
commit437cfe7a37df07e2201036fb0903cadae6b08e74 (patch)
tree8967d5f800d2e5c918933e747b47c98ee85566a4 /tools/perf/util/ui/browsers/hists.c
parentperf hists browser: Fix handling of TAB/UNTAB for multiple events (diff)
perf hists browser: Invalidate ui_browser->top after timer calls
With underlying dynamic data structures we need to invalidate pointers to them after a timer, as that entry may have vanished (decayed in top, for instance). I forgot about browser_ui->top. Fix it by resetting it to null after a timer. The seek operation from SEEK_SET will then set it to a valid entry because it starts from rb_first(&hists->entries). Reported-by: Ingo Molnar <mingo@elte.hu> 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-2ssjm0ouh9tsz4dwkcu7c40n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to '')
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 4a3a7c96b9b6..b144b108029a 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -600,14 +600,23 @@ static int hist_browser__show_entry(struct hist_browser *self,
return printed;
+static void ui_browser__hists_init_top(struct ui_browser *browser)
+ if (browser->top == NULL) {
+ struct hist_browser *hb;
+ hb = container_of(browser, struct hist_browser, b);
+ browser->top = rb_first(&hb->hists->entries);
+ }
static unsigned int hist_browser__refresh(struct ui_browser *self)
unsigned row = 0;
struct rb_node *nd;
struct hist_browser *hb = container_of(self, struct hist_browser, b);
- if (self->top == NULL)
- self->top = rb_first(&hb->hists->entries);
+ ui_browser__hists_init_top(self);
for (nd = self->top; nd; nd = rb_next(nd)) {
struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
@@ -659,6 +668,8 @@ static void ui_browser__hists_seek(struct ui_browser *self,
if (self->nr_entries == 0)
+ ui_browser__hists_init_top(self);
switch (whence) {
case SEEK_SET:
nd = hists__filter_entries(rb_first(self->entries));