perf hists: Don't free decayed entries if in the annotation browser
Just let it there till the user exits the annotation browser. 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-nmaxuzreqhm5k10t2co5sk9a@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
900e14a8f5
commit
df71d95f86
|
@ -100,6 +100,8 @@ static void hist_entry__decay(struct hist_entry *he)
|
||||||
|
|
||||||
static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
|
static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
|
||||||
{
|
{
|
||||||
|
if (he->period == 0)
|
||||||
|
return true;
|
||||||
hists->stats.total_period -= he->period;
|
hists->stats.total_period -= he->period;
|
||||||
hist_entry__decay(he);
|
hist_entry__decay(he);
|
||||||
hists->stats.total_period += he->period;
|
hists->stats.total_period += he->period;
|
||||||
|
@ -114,8 +116,12 @@ void hists__decay_entries(struct hists *hists)
|
||||||
while (next) {
|
while (next) {
|
||||||
n = rb_entry(next, struct hist_entry, rb_node);
|
n = rb_entry(next, struct hist_entry, rb_node);
|
||||||
next = rb_next(&n->rb_node);
|
next = rb_next(&n->rb_node);
|
||||||
|
/*
|
||||||
if (hists__decay_entry(hists, n)) {
|
* We may be annotating this, for instance, so keep it here in
|
||||||
|
* case some it gets new samples, we'll eventually free it when
|
||||||
|
* the user stops browsing and it agains gets fully decayed.
|
||||||
|
*/
|
||||||
|
if (hists__decay_entry(hists, n) && !n->used) {
|
||||||
rb_erase(&n->rb_node, &hists->entries);
|
rb_erase(&n->rb_node, &hists->entries);
|
||||||
|
|
||||||
if (sort__need_collapse)
|
if (sort__need_collapse)
|
||||||
|
|
|
@ -64,6 +64,7 @@ struct hist_entry {
|
||||||
|
|
||||||
bool init_have_children;
|
bool init_have_children;
|
||||||
char level;
|
char level;
|
||||||
|
bool used;
|
||||||
u8 filtered;
|
u8 filtered;
|
||||||
struct symbol *parent;
|
struct symbol *parent;
|
||||||
union {
|
union {
|
||||||
|
|
|
@ -976,9 +976,13 @@ do_annotate:
|
||||||
he = hist_browser__selected_entry(browser);
|
he = hist_browser__selected_entry(browser);
|
||||||
if (he == NULL)
|
if (he == NULL)
|
||||||
continue;
|
continue;
|
||||||
|
/*
|
||||||
|
* Don't let this be freed, say, by hists__decay_entry.
|
||||||
|
*/
|
||||||
|
he->used = true;
|
||||||
hist_entry__tui_annotate(he, evsel->idx, nr_events,
|
hist_entry__tui_annotate(he, evsel->idx, nr_events,
|
||||||
timer, arg, delay_secs);
|
timer, arg, delay_secs);
|
||||||
|
he->used = false;
|
||||||
ui_browser__update_nr_entries(&browser->b, browser->hists->nr_entries);
|
ui_browser__update_nr_entries(&browser->b, browser->hists->nr_entries);
|
||||||
} else if (choice == browse_map)
|
} else if (choice == browse_map)
|
||||||
map__browse(browser->selection->map);
|
map__browse(browser->selection->map);
|
||||||
|
|
Loading…
Reference in New Issue