aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-02-12 14:48:00 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-02-12 14:53:22 -0500
commit682dc24c2a0f13d5a16ac8f4303671eb8f11519f (patch)
treec5f00e75525af4da451240ec41c9fa0786e9231c
parentfc0a2c1d59beac70b8738f4ce14431b798837374 (diff)
perf tools: Use perf_event_terms__purge() for non-malloced terms
In these two cases, a 'perf test' entry and in the PMU code the list_head is on the stack, so we can't use perf_event__free_terms() (soon to be renamed to perf_event_terms__delete()), because it will free the list_head as well. Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: He Kuang <hekuang@huawei.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/n/tip-i956ryjhz97gnnqe8iqe7m7s@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/tests/parse-events.c2
-rw-r--r--tools/perf/util/pmu.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index abe8849d1d70..6648274f4601 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -1666,7 +1666,7 @@ static int test_term(struct terms_test *t)
1666 } 1666 }
1667 1667
1668 ret = t->check(&terms); 1668 ret = t->check(&terms);
1669 parse_events__free_terms(&terms); 1669 parse_events_terms__purge(&terms);
1670 1670
1671 return ret; 1671 return ret;
1672} 1672}
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 41a9c875e492..cf59fbaee491 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -354,7 +354,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias,
354 list_for_each_entry(term, &alias->terms, list) { 354 list_for_each_entry(term, &alias->terms, list) {
355 ret = parse_events_term__clone(&cloned, term); 355 ret = parse_events_term__clone(&cloned, term);
356 if (ret) { 356 if (ret) {
357 parse_events__free_terms(&list); 357 parse_events_terms__purge(&list);
358 return ret; 358 return ret;
359 } 359 }
360 list_add_tail(&cloned->list, &list); 360 list_add_tail(&cloned->list, &list);