Commit cf078c83 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Make delete_threads part of machine__exit 



The code required threads to be deleted before machine__exit was
called or the threads would be leaked. This was error prone so move
the delete_threads into machine__exit.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Brian Robbins <brianrob@linux.microsoft.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Fangrui Song <maskray@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Babrou <ivan@cloudflare.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Ye Xingchen <ye.xingchen@zte.com.cn>
Cc: Yuan Can <yuancan@huawei.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230608232823.4027869-9-irogers@google.com


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

tools/perf/tests/code-reading.c

+0 −1
Original line number Diff line number Diff line
@@ -721,7 +721,6 @@ static int do_test_code_reading(bool try_kcore) 
	evlist__delete(evlist);

	perf_cpu_map__put(cpus);

	perf_thread_map__put(threads);

	machine__delete_threads(machine);

	machine__delete(machine);



	return err;

tools/perf/tests/dwarf-unwind.c

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ noinline int test__dwarf_unwind(struct test_suite *test __maybe_unused, 
	thread__put(thread);



 out:

	machine__delete_threads(machine);

	machine__delete(machine);

	return err;

}

tools/perf/tests/mmap-thread-lookup.c

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ static int mmap_events(synth_cb synth) 
		addr_location__exit(&al);

	}



	machine__delete_threads(machine);

	machine__delete(machine);

	return err;

}

tools/perf/tests/symbols.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static int init_test_info(struct test_info *ti) 
static void exit_test_info(struct test_info *ti)

{

	thread__put(ti->thread);

	machine__delete_threads(ti->machine);

	machine__delete(ti->machine);

}

tools/perf/util/machine.c

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ void machine__exit(struct machine *machine) 
	zfree(&machine->current_tid);

	zfree(&machine->kallsyms_filename);



	machine__delete_threads(machine);

	for (i = 0; i < THREADS__TABLE_SIZE; i++) {

		struct threads *threads = &machine->threads[i];