archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8308235: ThreadContainer registry accumulates weak refs

Browse source 
Reviewed-by: jpai
This commit is contained in:
Alan Bateman 2023-05-23 07:05:07 +00:00
parent 5d8ba938be
commit ada416e66c
2 changed files with 52 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/jdk/internal/vm/ThreadContainers.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -65,7 +65,7 @@ public class ThreadContainers {
*/ */
public static Object registerContainer(ThreadContainer container) { public static Object registerContainer(ThreadContainer container) {
expungeStaleEntries(); expungeStaleEntries();
var ref = new WeakReference<>(container); var ref = new WeakReference<>(container, QUEUE);
CONTAINER_REGISTRY.add(ref); CONTAINER_REGISTRY.add(ref);
return ref; return ref;
} }

50
test/jdk/java/util/concurrent/Executors/UnreferencedExecutor.java Normal file
View file

@ -0,0 +1,50 @@
/*
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8308235
* @summary Unreference ExecutorService objects returned by the Executors without shutdown
* and termination, this should not leak memory
* @run main/othervm -Xmx32m UnreferencedExecutor
*/
import java.time.Duration;
import java.util.concurrent.Executors;
public class UnreferencedExecutor {
private static final int DURATION_IN_SECONDS = 5;
public static void main(String[] args) throws Exception {
int ncores = Runtime.getRuntime().availableProcessors();
long durationNanos = Duration.ofSeconds(DURATION_IN_SECONDS).toNanos();
long start = System.nanoTime();
while (System.nanoTime() - start < durationNanos) {
Executors.newFixedThreadPool(ncores);
Executors.newCachedThreadPool();
Executors.newVirtualThreadPerTaskExecutor();
Executors.newWorkStealingPool(ncores);
}
}
}