mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
perf hists: Introduce function for deleting/removing hist_entry
The code being used when decaying and deleting entries from a hists instance was the same, provide a function to avoid code dup. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: David Ahern <dsahern@gmail.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-j6ideab7lkakavfvfguw858z@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
6733d1bf7f
commit
956b65e1a7
1 changed files with 16 additions and 20 deletions
|
@ -241,6 +241,20 @@ static bool hists__decay_entry(struct hists *hists, struct hist_entry *he)
|
|||
return he->stat.period == 0;
|
||||
}
|
||||
|
||||
static void hists__delete_entry(struct hists *hists, struct hist_entry *he)
|
||||
{
|
||||
rb_erase(&he->rb_node, &hists->entries);
|
||||
|
||||
if (sort__need_collapse)
|
||||
rb_erase(&he->rb_node_in, &hists->entries_collapsed);
|
||||
|
||||
--hists->nr_entries;
|
||||
if (!he->filtered)
|
||||
--hists->nr_non_filtered_entries;
|
||||
|
||||
hist_entry__delete(he);
|
||||
}
|
||||
|
||||
void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)
|
||||
{
|
||||
struct rb_node *next = rb_first(&hists->entries);
|
||||
|
@ -258,16 +272,7 @@ void hists__decay_entries(struct hists *hists, bool zap_user, bool zap_kernel)
|
|||
(zap_kernel && n->level != '.') ||
|
||||
hists__decay_entry(hists, n)) &&
|
||||
!n->used) {
|
||||
rb_erase(&n->rb_node, &hists->entries);
|
||||
|
||||
if (sort__need_collapse)
|
||||
rb_erase(&n->rb_node_in, &hists->entries_collapsed);
|
||||
|
||||
--hists->nr_entries;
|
||||
if (!n->filtered)
|
||||
--hists->nr_non_filtered_entries;
|
||||
|
||||
hist_entry__delete(n);
|
||||
hists__delete_entry(hists, n);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -281,16 +286,7 @@ void hists__delete_entries(struct hists *hists)
|
|||
n = rb_entry(next, struct hist_entry, rb_node);
|
||||
next = rb_next(&n->rb_node);
|
||||
|
||||
rb_erase(&n->rb_node, &hists->entries);
|
||||
|
||||
if (sort__need_collapse)
|
||||
rb_erase(&n->rb_node_in, &hists->entries_collapsed);
|
||||
|
||||
--hists->nr_entries;
|
||||
if (!n->filtered)
|
||||
--hists->nr_non_filtered_entries;
|
||||
|
||||
hist_entry__delete(n);
|
||||
hists__delete_entry(hists, n);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue