Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1311407

[PATCH 11/26] perf tools: Properly release format fields

From Jiri Olsa <jolsa@kernel.org>
Newsgroups linux.kernel
Subject [PATCH 11/26] perf tools: Properly release format fields
Date 2016-01-18 10:30 +0100
Message-ID <qSeim-73y-33@gated-at.bofh.it> (permalink)
References <qSeil-73y-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

With multiple list holding format entries, we need the
support support to properly release format output/sort
fields.

Link: http://lkml.kernel.org/n/tip-4gs7pj4kgbvgs38vyj7m9z0i@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/ui/hist.c   |  8 ++++++++
 tools/perf/util/hist.h |  1 +
 tools/perf/util/sort.c | 24 ++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 80d63a997287..2cd1a03bf375 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -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)
 {
 	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) {
 		list_del_init(&fmt->list);
 		list_del_init(&fmt->sort_list);
+		fmt_free(fmt);
 	}
 
 	/* reset sort keys */
 	perf_hpp__for_each_sort_list_safe(fmt, tmp) {
 		list_del_init(&fmt->list);
 		list_del_init(&fmt->sort_list);
+		fmt_free(fmt);
 	}
 }
 
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 1f9e21dd53f3..f3bcf2d38733 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -216,6 +216,7 @@ struct perf_hpp_fmt {
 	int64_t (*sort)(struct perf_hpp_fmt *fmt,
 			struct hist_entry *a, struct hist_entry *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 sort_list;
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index a4ce4807fbb7..a7eed4485afc 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1544,6 +1544,14 @@ static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
 	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 *
 __sort_dimension__alloc_hpp(struct sort_dimension *sd)
 {
@@ -1566,6 +1574,7 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
 	hse->hpp.collapse = __sort__hpp_collapse;
 	hse->hpp.sort = __sort__hpp_sort;
 	hse->hpp.equal = __sort__hpp_equal;
+	hse->hpp.free = hse_free;
 
 	INIT_LIST_HEAD(&hse->hpp.list);
 	INIT_LIST_HEAD(&hse->hpp.sort_list);
@@ -1576,6 +1585,11 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
 	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)
 {
 	struct perf_hpp_fmt *fmt;
@@ -1584,6 +1598,7 @@ static struct perf_hpp_fmt *__hpp_dimension__alloc_hpp(struct hpp_dimension *hd)
 	if (fmt) {
 		INIT_LIST_HEAD(&fmt->list);
 		INIT_LIST_HEAD(&fmt->sort_list);
+		fmt->free = hpp_free;
 	}
 
 	return fmt;
@@ -1817,6 +1832,14 @@ bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *fmt)
 	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 *
 __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
 {
@@ -1841,6 +1864,7 @@ __alloc_dynamic_entry(struct perf_evsel *evsel, struct format_field *field)
 	hde->hpp.cmp = __sort__hde_cmp;
 	hde->hpp.collapse = __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.sort_list);
-- 
2.4.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
    Re: [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Namhyung Kim <namhyung@kernel.org> - 2016-01-25 16:10 +0100
      Re: [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa <jolsa@redhat.com> - 2016-01-25 16:10 +0100
  [PATCH 21/26] perf tools: Introduce perf_hpp_list__for_each_sort_list macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 16/26] perf tools: Add perf_hpp_list register helpers Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 17/26] perf tools: Pass perf_hpp_list all the way through setup_sort_list Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 09/26] perf tools: Allocate output sort field Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 13/26] perf tools: Separate output fields parsing into setup_output_list function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 15/26] perf tools: Introduce perf_hpp_list__init function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 11/26] perf tools: Properly release format fields Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 07/26] perf tools: Make hpp setup function generic Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 12/26] perf tools: Separate sort fields parsing into setup_sort_list function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 20/26] perf tools: Introduce perf_hpp_list__for_each_format_safe macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 23/26] perf tools: Add struct perf_hpp_list argument to helper functions Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 26/26] perf tools: Introduce hists__for_each_sort_list macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 06/26] perf tools: Add hpp__equal callback function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 22/26] perf tools: Introduce perf_hpp_list__for_each_sort_list_safe macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 19/26] perf tools: Introduce perf_hpp_list__for_each_format macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 25/26] perf tools: Introduce hists__for_each_format macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 01/26] perf tools: Factor output_resort from hists__output_resort Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  [PATCH 05/26] perf tools: Add equal method to perf_hpp_fmt struct Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  [PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  Re: [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim <namhyung@kernel.org> - 2016-01-19 14:00 +0100
    Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-19 14:30 +0100
  Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-25 08:20 +0100
    Re: [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim <namhyung@kernel.org> - 2016-01-25 15:30 +0100
      Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-25 15:40 +0100

csiph-web