Commit 682dc24c authored Feb 12, 2016 by Arnaldo Carvalho de Melo

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>

parent fc0a2c1d

tools/perf/tests/parse-events.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1666,7 +1666,7 @@ static int test_term(struct terms_test *t)
		}

		ret = t->check(&terms);
		parse_events__free_terms(&terms);
		parse_events_terms__purge(&terms);

		return ret;
		}

tools/perf/util/pmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ static int pmu_alias_terms(struct perf_pmu_alias *alias,
		list_for_each_entry(term, &alias->terms, list) {
		ret = parse_events_term__clone(&cloned, term);
		if (ret) {
		parse_events__free_terms(&list);
		parse_events_terms__purge(&list);
		return ret;
		}
		list_add_tail(&cloned->list, &list);

Admin message