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

Commit 70d544d0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Delete the event selectors at exit 



Freeing all the possibly allocated resources, reducing complexity
on each tool exit path.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1e7972cc

tools/perf/builtin-record.c

+0 −2
Original line number Diff line number Diff line
@@ -965,8 +965,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __used) 
out_free_event_array:

	free(event_array);

out_free_fd:

	list_for_each_entry(pos, &evsel_list, node)

		perf_evsel__free_fd(pos);

	free(all_tids);

	all_tids = NULL;

out_symbol_exit:

tools/perf/builtin-stat.c

+1 −3
Original line number Diff line number Diff line
@@ -844,10 +844,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used) 
	if (status != -1)

		print_stat(argc, argv);

out_free_fd:

	list_for_each_entry(pos, &evsel_list, node) {

		perf_evsel__free_fd(pos);

	list_for_each_entry(pos, &evsel_list, node)

		perf_evsel__free_stat_priv(pos);

	}

out:

	return status;

}

tools/perf/builtin-top.c

+1 −3
Original line number Diff line number Diff line
@@ -1495,10 +1495,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __used) 


	status = __cmd_top();

out_free_fd:

	list_for_each_entry(pos, &evsel_list, node) {

		perf_evsel__free_fd(pos);

	list_for_each_entry(pos, &evsel_list, node)

		perf_evsel__free_mmap(pos);

	}



	return status;

}

tools/perf/perf.c

+2 −0
Original line number Diff line number Diff line
@@ -286,6 +286,8 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 
	status = p->fn(argc, argv, prefix);

	exit_browser(status);



	perf_evsel_list__delete();



	if (status)

		return status & 0xff;

tools/perf/util/parse-events.c

+11 −0
Original line number Diff line number Diff line
@@ -982,3 +982,14 @@ int perf_evsel_list__create_default(void) 
	++nr_counters;

	return 0;

}



void perf_evsel_list__delete(void)

{

	struct perf_evsel *pos, *n;



	list_for_each_entry_safe(pos, n, &evsel_list, node) {

		list_del_init(&pos->node);

		perf_evsel__delete(pos);

	}

	nr_counters = 0;

}