lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf hists browser: Invalidate ui_browser->top after timer calls

Browse Source 
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>
This commit is contained in:
Arnaldo Carvalho de Melo
2011-10-14 09:31:53 -03:00
parent 18eaf0b8e6
commit 437cfe7a37
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/util/ui/browser.c
View File

@@ -249,6 +249,7 @@ void ui_browser__update_nr_entries(struct ui_browser *browser, u32 nr_entries)
browser->top_idx += offset; browser->top_idx += offset;
} }
browser->top = NULL;
browser->seek(browser, browser->top_idx, SEEK_SET); browser->seek(browser, browser->top_idx, SEEK_SET);
} }

15
tools/perf/util/ui/browsers/hists.c
View File

@@ -600,14 +600,23 @@ static int hist_browser__show_entry(struct hist_browser *self,
return printed; 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) static unsigned int hist_browser__refresh(struct ui_browser *self)
{ {
unsigned row = 0; unsigned row = 0;
struct rb_node *nd; struct rb_node *nd;
struct hist_browser *hb = container_of(self, struct hist_browser, b); struct hist_browser *hb = container_of(self, struct hist_browser, b);
if (self->top == NULL) ui_browser__hists_init_top(self);
self->top = rb_first(&hb->hists->entries);
for (nd = self->top; nd; nd = rb_next(nd)) { for (nd = self->top; nd; nd = rb_next(nd)) {
struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node); 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) if (self->nr_entries == 0)
return; return;
ui_browser__hists_init_top(self);
switch (whence) { switch (whence) {
case SEEK_SET: case SEEK_SET:
nd = hists__filter_entries(rb_first(self->entries)); nd = hists__filter_entries(rb_first(self->entries));