96 lines
3.2 KiB
Diff
96 lines
3.2 KiB
Diff
From d148b6f6302f62d71dff7c93a00cb09c4181c88b Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Tue, 2 Jun 2020 23:47:38 +0200
|
|
Subject: [PATCH 101/201] perf tools: Release metric_events rblist
|
|
|
|
mainline inclusion
|
|
from mainline-v5.9-rc1
|
|
commit 9afe5658a6fa89f59f01d2857d78203cc8665f1c
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9afe5658a6fa89f59f01d2857d78203cc8665f1c
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
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 <jolsa@kernel.org>
|
|
Acked-by: Ian Rogers <irogers@google.com>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <ak@linux.intel.com>
|
|
Cc: Michael Petlan <mpetlan@redhat.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Stephane Eranian <eranian@google.com>
|
|
Link: http://lore.kernel.org/lkml/20200602214741.1218986-11-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
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 56f62a9d0f0d..ad81defc42db 100644
|
|
--- a/tools/perf/builtin-stat.c
|
|
+++ b/tools/perf/builtin-stat.c
|
|
@@ -3180,6 +3180,7 @@ int cmd_stat(int argc, const char **argv)
|
|
|
|
perf_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 5058db5810aa..230c6d092ca2 100644
|
|
--- a/tools/perf/util/metricgroup.c
|
|
+++ b/tools/perf/util/metricgroup.c
|
|
@@ -82,11 +82,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 11811764edde..c198e2c4a294 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.27.0
|
|
|