Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de233b9 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf top: Delete maps on exit 

Removing one more memory leak found with valgrind.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-gnb1gms0k8wictmtm2umpr8u@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 11859e82

tools/perf/builtin-top.c

+4 −2
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (!top.evlist->nr_entries &&

	    perf_evlist__add_default(top.evlist) < 0) {

		ui__error("Not enough memory for event selector list\n");

		return -ENOMEM;

		goto out_delete_maps;

	}



	symbol_conf.nr_events = top.evlist->nr_entries;
@@ -1187,7 +1187,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	} else {

		ui__error("frequency and count are zero, aborting\n");

		status = -EINVAL;

		goto out_delete_evlist;

		goto out_delete_maps;

	}



	top.sym_evsel = perf_evlist__first(top.evlist);
@@ -1220,6 +1220,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 


	status = __cmd_top(&top);



out_delete_maps:

	perf_evlist__delete_maps(top.evlist);

out_delete_evlist:

	perf_evlist__delete(top.evlist);