Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
cf078c83 f6005caf

+1 -10
-1
tools/perf/tests/code-reading.c
··· 721 721 evlist__delete(evlist); 722 722 perf_cpu_map__put(cpus); 723 723 perf_thread_map__put(threads); 724 - machine__delete_threads(machine); 725 724 machine__delete(machine); 726 725 727 726 return err;
-1
tools/perf/tests/dwarf-unwind.c
··· 235 235 thread__put(thread); 236 236 237 237 out: 238 - machine__delete_threads(machine); 239 238 machine__delete(machine); 240 239 return err; 241 240 }
-1
tools/perf/tests/mmap-thread-lookup.c
··· 208 208 addr_location__exit(&al); 209 209 } 210 210 211 - machine__delete_threads(machine); 212 211 machine__delete(machine); 213 212 return err; 214 213 }
-1
tools/perf/tests/symbols.c
··· 38 38 static void exit_test_info(struct test_info *ti) 39 39 { 40 40 thread__put(ti->thread); 41 - machine__delete_threads(ti->machine); 42 41 machine__delete(ti->machine); 43 42 } 44 43
+1
tools/perf/util/machine.c
··· 256 256 zfree(&machine->current_tid); 257 257 zfree(&machine->kallsyms_filename); 258 258 259 + machine__delete_threads(machine); 259 260 for (i = 0; i < THREADS__TABLE_SIZE; i++) { 260 261 struct threads *threads = &machine->threads[i]; 261 262
-6
tools/perf/util/session.c
··· 278 278 return ERR_PTR(ret); 279 279 } 280 280 281 - static void perf_session__delete_threads(struct perf_session *session) 282 - { 283 - machine__delete_threads(&session->machines.host); 284 - } 285 - 286 281 static void perf_decomp__release_events(struct decomp *next) 287 282 { 288 283 struct decomp *decomp; ··· 300 305 auxtrace__free(session); 301 306 auxtrace_index__free(&session->auxtrace_index); 302 307 perf_session__destroy_kernel_maps(session); 303 - perf_session__delete_threads(session); 304 308 perf_decomp__release_events(session->decomp_data.decomp); 305 309 perf_env__exit(&session->header.env); 306 310 machines__exit(&session->machines);