Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf hists: Properly release format fields

Browse Source 
With multiple list holding format entries, we need the support properly
releasing format output/sort fields.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-12-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2016-01-18 10:24:09 +01:00 committed by Arnaldo Carvalho de Melo
parent 12cb4397fb
commit 564132f311
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/perf/ui/hist.c
View File

@ -583,6 +583,12 @@ next:
} }
} }
static void fmt_free(struct perf_hpp_fmt *fmt)
{
if (fmt->free)
fmt->free(fmt);
}
void perf_hpp__reset_output_field(void) void perf_hpp__reset_output_field(void)
{ {
struct perf_hpp_fmt *fmt, *tmp; struct perf_hpp_fmt *fmt, *tmp;
@ -591,12 +597,14 @@ void perf_hpp__reset_output_field(void)
perf_hpp__for_each_format_safe(fmt, tmp) { perf_hpp__for_each_format_safe(fmt, tmp) {
list_del_init(&fmt->list); list_del_init(&fmt->list);
list_del_init(&fmt->sort_list); list_del_init(&fmt->sort_list);
fmt_free(fmt);
} }
/* reset sort keys */ /* reset sort keys */
perf_hpp__for_each_sort_list_safe(fmt, tmp) { perf_hpp__for_each_sort_list_safe(fmt, tmp) {
list_del_init(&fmt->list); list_del_init(&fmt->list);
list_del_init(&fmt->sort_list); list_del_init(&fmt->sort_list);
fmt_free(fmt);
} }
} }

1
tools/perf/util/hist.h
View File

@ -216,6 +216,7 @@ struct perf_hpp_fmt {
int64_t (*sort)(struct perf_hpp_fmt *fmt, int64_t (*sort)(struct perf_hpp_fmt *fmt,
struct hist_entry *a, struct hist_entry *b); struct hist_entry *a, struct hist_entry *b);
bool (*equal)(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b); bool (*equal)(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b);
void (*free)(struct perf_hpp_fmt *fmt);
struct list_head list; struct list_head list;
struct list_head sort_list; struct list_head sort_list;

24
tools/perf/util/sort.c
View File

@ -1545,6 +1545,14 @@ static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
return hse_a->se == hse_b->se; return hse_a->se == hse_b->se;
} }
static void hse_free(struct perf_hpp_fmt *fmt)
{
struct hpp_sort_entry *hse;
hse = container_of(fmt, struct hpp_sort_entry, hpp);
free(hse);
}
static struct hpp_sort_entry * static struct hpp_sort_entry *
__sort_dimension__alloc_hpp(struct sort_dimension *sd) __sort_dimension__alloc_hpp(struct sort_dimension *sd)
{ {
@ -1567,6 +1575,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
hse->hpp.collapse = __sort__hpp_collapse; hse->hpp.collapse = __sort__hpp_collapse;
hse->hpp.sort = __sort__hpp_sort; hse->hpp.sort = __sort__hpp_sort;
hse->hpp.equal = __sort__hpp_equal; hse->hpp.equal = __sort__hpp_equal;
hse->hpp.free = hse_free;
INIT_LIST_HEAD(&hse->hpp.list); INIT_LIST_HEAD(&hse->hpp.list);
INIT_LIST_HEAD(&hse->hpp.sort_list); INIT_LIST_HEAD(&hse->hpp.sort_list);
@ -1577,6 +1586,11 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
return hse; return hse;
} }
static void hpp_free(struct perf_hpp_fmt *fmt)
{
free(fmt);
}
static struct perf_hpp_fmt *__hpp_dimension__alloc_hpp(struct hpp_dimension *hd) static struct perf_hpp_fmt *__hpp_dimension__alloc_hpp(struct hpp_dimension *hd)
{ {
struct perf_hpp_fmt *fmt; struct perf_hpp_fmt *fmt;
@ -1585,6 +1599,7 @@ static struct perf_hpp_fmt *__hpp_dimension__alloc_hpp(struct hpp_dimension *hd)
if (fmt) { if (fmt) {
INIT_LIST_HEAD(&fmt->list); INIT_LIST_HEAD(&fmt->list);
INIT_LIST_HEAD(&fmt->sort_list); INIT_LIST_HEAD(&fmt->sort_list);
fmt->free = hpp_free;
} }
return fmt; return fmt;
@ -1818,6 +1833,14 @@ bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *fmt)
return fmt->cmp == __sort__hde_cmp; return fmt->cmp == __sort__hde_cmp;
} }
static void hde_free(struct perf_hpp_fmt *fmt)
{
struct hpp_dynamic_entry *hde;
hde = container_of(fmt, struct hpp_dynamic_entry, hpp);
free(hde);
}
static struct hpp_dynamic_entry * static struct hpp_dynamic_entry *
__alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field) __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
{ {
@ -1842,6 +1865,7 @@ __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
hde->hpp.cmp = __sort__hde_cmp; hde->hpp.cmp = __sort__hde_cmp;
hde->hpp.collapse = __sort__hde_cmp; hde->hpp.collapse = __sort__hde_cmp;
hde->hpp.sort = __sort__hde_cmp; hde->hpp.sort = __sort__hde_cmp;
hde->hpp.free = hde_free;
INIT_LIST_HEAD(&hde->hpp.list); INIT_LIST_HEAD(&hde->hpp.list);
INIT_LIST_HEAD(&hde->hpp.sort_list); INIT_LIST_HEAD(&hde->hpp.sort_list);