[PATCH 10/13] perf tools: Release metric_events rblist

[Jiri Olsa]

We don't release metric_events rblist, add the missing
delete hook and call the release before leaving cmd_stat.

Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/builtin-stat.c     |  1 +
 tools/perf/util/metricgroup.c | 19 +++++++++++++++++++
 tools/perf/util/metricgroup.h |  1 +
 3 files changed, 21 insertions(+)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 8a0c470dd92b..6d45b9783b73 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -2252,6 +2252,7 @@ int cmd_stat(int argc, const char **argv)
 
        evlist__delete(evsel_list);
 
+       metricgroup__rblist_exit(&stat_config.metric_events);
        runtime_stat_delete(&stat_config);
 
        return status;
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index fe33fee7f6ad..1b80a7901388 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -76,11 +76,30 @@ static struct rb_node *metric_event_new(struct rblist 
*rblist __maybe_unused,
        return &me->nd;
 }
 
+static void metric_event_delete(struct rblist *rblist __maybe_unused,
+                               struct rb_node *rb_node)
+{
+       struct metric_event *me = container_of(rb_node, struct metric_event, 
nd);
+       struct metric_expr *expr, *tmp;
+
+       list_for_each_entry_safe(expr, tmp, &me->head, nd) {
+               free(expr);
+       }
+
+       free(me);
+}
+
 static void metricgroup__rblist_init(struct rblist *metric_events)
 {
        rblist__init(metric_events);
        metric_events->node_cmp = metric_event_cmp;
        metric_events->node_new = metric_event_new;
+       metric_events->node_delete = metric_event_delete;
+}
+
+void metricgroup__rblist_exit(struct rblist *metric_events)
+{
+       rblist__exit(metric_events);
 }
 
 struct egroup {
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index 426c824e20bf..8315bd1a7da4 100644
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -47,4 +47,5 @@ void metricgroup__print(bool metrics, bool groups, char 
*filter,
                        bool raw, bool details);
 bool metricgroup__has_metric(const char *metric);
 int arch_get_runtimeparam(void);
+void metricgroup__rblist_exit(struct rblist *metric_events);
 #endif
-- 
2.25.4