undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
|
|
@ -0,0 +1,103 @@
|
|||
/*
|
||||
* Copyright (c) 2023, 2025, 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
|
||||
* @summary Stress test of StructuredTaskScope cancellation with running and starting threads
|
||||
* @enablePreview
|
||||
* @run junit StressCancellation
|
||||
*/
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.concurrent.StructuredTaskScope;
|
||||
import java.util.concurrent.StructuredTaskScope.Joiner;
|
||||
import java.util.concurrent.StructuredTaskScope.Subtask;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.stream.IntStream;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class StressCancellation {
|
||||
|
||||
static Stream<Arguments> testCases() {
|
||||
Stream<ThreadFactory> factories = Stream.of(
|
||||
Thread.ofPlatform().factory(),
|
||||
Thread.ofVirtual().factory()
|
||||
);
|
||||
// 0..15 forks before shutdown, 0..15 forks after shutdown
|
||||
return factories.flatMap(f -> IntStream.range(0, 256)
|
||||
.mapToObj(x -> Arguments.of(f, x & 0x0F, (x & 0xF0) >> 4)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Test StructuredTaskScope cancellation with running threads and concurrently with
|
||||
* threads that are starting. The cancellation should interrupt all running threads,
|
||||
* join should wakeup, and close would complete quickly.
|
||||
*
|
||||
* @param factory the ThreadFactory to use
|
||||
* @param beforeCancel the number of subtasks to fork before cancel
|
||||
* @param afterCancel the number of subtasks to fork after cancel
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("testCases")
|
||||
void test(ThreadFactory factory, int beforeCancel, int afterCancel) throws Exception {
|
||||
var joiner = new Joiner<Boolean, Void>() {
|
||||
@Override
|
||||
public boolean onComplete(Subtask<Boolean> subtask) {
|
||||
boolean cancel = subtask.get();
|
||||
return cancel;
|
||||
}
|
||||
@Override
|
||||
public Void result() {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
try (var scope = StructuredTaskScope.open(joiner, cf -> cf.withThreadFactory(factory))) {
|
||||
// fork subtasks
|
||||
for (int i = 0; i < beforeCancel; i++) {
|
||||
scope.fork(() -> {
|
||||
Thread.sleep(Duration.ofDays(1));
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
// fork subtask to cancel
|
||||
scope.fork(() -> true);
|
||||
|
||||
// fork after forking subtask to cancel
|
||||
for (int i = 0; i < afterCancel; i++) {
|
||||
scope.fork(() -> {
|
||||
Thread.sleep(Duration.ofDays(1));
|
||||
return false;
|
||||
});
|
||||
}
|
||||
|
||||
scope.join();
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,198 @@
|
|||
/*
|
||||
* Copyright (c) 2022, 2025, 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 8284199 8296779 8306647
|
||||
* @summary Test thread dumps with StructuredTaskScope
|
||||
* @enablePreview
|
||||
* @library /test/lib
|
||||
* @run junit/othervm StructuredThreadDumpTest
|
||||
*/
|
||||
|
||||
import java.util.concurrent.StructuredTaskScope;
|
||||
import java.util.concurrent.StructuredTaskScope.Joiner;
|
||||
import java.io.IOException;
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.concurrent.locks.LockSupport;
|
||||
import java.util.stream.Stream;
|
||||
import com.sun.management.HotSpotDiagnosticMXBean;
|
||||
import com.sun.management.HotSpotDiagnosticMXBean.ThreadDumpFormat;
|
||||
import jdk.test.lib.threaddump.ThreadDump;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class StructuredThreadDumpTest {
|
||||
|
||||
/**
|
||||
* Test that a thread dump with a tree of task scopes contains a thread grouping for
|
||||
* each task scope.
|
||||
*/
|
||||
@Test
|
||||
void testTree() throws Exception {
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope"))) {
|
||||
Thread thread1 = fork(scope, "child-scope-A");
|
||||
Thread thread2 = fork(scope, "child-scope-B");
|
||||
try {
|
||||
ThreadDump threadDump = threadDump();
|
||||
|
||||
// thread dump should have a thread container for each scope
|
||||
var rootContainer = threadDump.rootThreadContainer();
|
||||
var container1 = threadDump.findThreadContainer("scope").orElseThrow();
|
||||
var container2 = threadDump.findThreadContainer("child-scope-A").orElseThrow();
|
||||
var container3 = threadDump.findThreadContainer("child-scope-B").orElseThrow();
|
||||
|
||||
// check parents
|
||||
assertFalse(rootContainer.parent().isPresent());
|
||||
assertTrue(container1.parent().get() == rootContainer);
|
||||
assertTrue(container2.parent().get() == container1);
|
||||
assertTrue(container3.parent().get() == container1);
|
||||
|
||||
// check owners
|
||||
assertFalse(rootContainer.owner().isPresent());
|
||||
assertTrue(container1.owner().getAsLong() == Thread.currentThread().threadId());
|
||||
assertTrue(container2.owner().getAsLong() == thread1.threadId());
|
||||
assertTrue(container3.owner().getAsLong() == thread2.threadId());
|
||||
|
||||
// thread1 and threads2 should be in threads array of "scope"
|
||||
container1.findThread(thread1.threadId()).orElseThrow();
|
||||
container1.findThread(thread2.threadId()).orElseThrow();
|
||||
|
||||
} finally {
|
||||
LockSupport.unpark(thread1);
|
||||
LockSupport.unpark(thread2);
|
||||
scope.join();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that a thread dump with nested tasks scopes contains a thread grouping for
|
||||
* each task scope.
|
||||
*/
|
||||
@Test
|
||||
void testNested() throws Exception {
|
||||
try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope-A"))) {
|
||||
Thread thread1 = fork(scope1);
|
||||
|
||||
try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(), cf -> cf.withName("scope-B"))) {
|
||||
Thread thread2 = fork(scope2);
|
||||
try {
|
||||
ThreadDump threadDump = threadDump();
|
||||
|
||||
// thread dump should have a thread container for both scopes
|
||||
var rootContainer = threadDump.rootThreadContainer();
|
||||
var container1 = threadDump.findThreadContainer("scope-A").orElseThrow();
|
||||
var container2 = threadDump.findThreadContainer("scope-B").orElseThrow();
|
||||
|
||||
// check parents
|
||||
assertFalse(rootContainer.parent().isPresent());
|
||||
assertTrue(container1.parent().get() == rootContainer);
|
||||
assertTrue(container2.parent().get() == container1);
|
||||
|
||||
// check owners
|
||||
long tid = Thread.currentThread().threadId();
|
||||
assertFalse(rootContainer.owner().isPresent());
|
||||
assertTrue(container1.owner().getAsLong() == tid);
|
||||
assertTrue(container2.owner().getAsLong() == tid);
|
||||
|
||||
// thread1 should be in threads array of "scope-A"
|
||||
container1.findThread(thread1.threadId()).orElseThrow();
|
||||
|
||||
// thread2 should be in threads array of "scope-B"
|
||||
container2.findThread(thread2.threadId()).orElseThrow();
|
||||
|
||||
} finally {
|
||||
LockSupport.unpark(thread2);
|
||||
scope2.join();
|
||||
}
|
||||
} finally {
|
||||
LockSupport.unpark(thread1);
|
||||
scope1.join();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a JSON formatted thread dump to a temporary file, prints it to standard
|
||||
* output, parses the JSON text and returns a ThreadDump object for the thread dump.
|
||||
*/
|
||||
private static ThreadDump threadDump() throws IOException {
|
||||
Path dir = Path.of(".").toAbsolutePath();
|
||||
Path file = Files.createTempFile(dir, "threadump", "json");
|
||||
Files.delete(file);
|
||||
ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class)
|
||||
.dumpThreads(file.toString(), ThreadDumpFormat.JSON);
|
||||
|
||||
try (Stream<String> stream = Files.lines(file)) {
|
||||
stream.forEach(System.out::println);
|
||||
}
|
||||
|
||||
String jsonText = Files.readString(file);
|
||||
return ThreadDump.parse(jsonText);
|
||||
}
|
||||
|
||||
/**
|
||||
* Forks a subtask in the given scope that parks, returning the Thread that executes
|
||||
* the subtask.
|
||||
*/
|
||||
private static Thread fork(StructuredTaskScope<Object, Void> scope) throws Exception {
|
||||
var ref = new AtomicReference<Thread>();
|
||||
scope.fork(() -> {
|
||||
ref.set(Thread.currentThread());
|
||||
LockSupport.park();
|
||||
return null;
|
||||
});
|
||||
Thread thread;
|
||||
while ((thread = ref.get()) == null) {
|
||||
Thread.sleep(10);
|
||||
}
|
||||
return thread;
|
||||
}
|
||||
|
||||
/**
|
||||
* Forks a subtask in the given scope. The subtask creates a new child scope with
|
||||
* the given name, then parks. This method returns Thread that executes the subtask.
|
||||
*/
|
||||
private static Thread fork(StructuredTaskScope<Object, Void> scope,
|
||||
String childScopeName) throws Exception {
|
||||
var ref = new AtomicReference<Thread>();
|
||||
scope.fork(() -> {
|
||||
try (var childScope = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withName(childScopeName))) {
|
||||
ref.set(Thread.currentThread());
|
||||
LockSupport.park();
|
||||
}
|
||||
});
|
||||
Thread thread;
|
||||
while ((thread = ref.get()) == null) {
|
||||
Thread.sleep(10);
|
||||
}
|
||||
return thread;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,224 @@
|
|||
/*
|
||||
* Copyright (c) 2022, 2025, 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 8284199 8296779 8306647
|
||||
* @summary Basic tests for StructuredTaskScope with scoped values
|
||||
* @enablePreview
|
||||
* @run junit WithScopedValue
|
||||
*/
|
||||
|
||||
import java.util.concurrent.StructuredTaskScope;
|
||||
import java.util.concurrent.StructuredTaskScope.Subtask;
|
||||
import java.util.concurrent.StructuredTaskScope.Joiner;
|
||||
import java.util.concurrent.StructureViolationException;
|
||||
import java.util.concurrent.ThreadFactory;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class WithScopedValue {
|
||||
|
||||
private static Stream<ThreadFactory> factories() {
|
||||
return Stream.of(Thread.ofPlatform().factory(), Thread.ofVirtual().factory());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that fork inherits a scoped value into a child thread.
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("factories")
|
||||
void testForkInheritsScopedValue1(ThreadFactory factory) throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
String value = ScopedValue.where(name, "x").call(() -> {
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withThreadFactory(factory))) {
|
||||
Subtask<String> subtask = scope.fork(() -> {
|
||||
return name.get(); // child should read "x"
|
||||
});
|
||||
scope.join();
|
||||
return subtask.get();
|
||||
}
|
||||
});
|
||||
assertEquals(value, "x");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that fork inherits a scoped value into a grandchild thread.
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("factories")
|
||||
void testForkInheritsScopedValue2(ThreadFactory factory) throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
String value = ScopedValue.where(name, "x").call(() -> {
|
||||
try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withThreadFactory(factory))) {
|
||||
Subtask<String> subtask1 = scope1.fork(() -> {
|
||||
try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withThreadFactory(factory))) {
|
||||
Subtask<String> subtask2 = scope2.fork(() -> {
|
||||
return name.get(); // grandchild should read "x"
|
||||
});
|
||||
scope2.join();
|
||||
return subtask2.get();
|
||||
}
|
||||
});
|
||||
scope1.join();
|
||||
return subtask1.get();
|
||||
}
|
||||
});
|
||||
assertEquals(value, "x");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that fork inherits a rebound scoped value into a grandchild thread.
|
||||
*/
|
||||
@ParameterizedTest
|
||||
@MethodSource("factories")
|
||||
void testForkInheritsScopedValue3(ThreadFactory factory) throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
String value = ScopedValue.where(name, "x").call(() -> {
|
||||
try (var scope1 = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withThreadFactory(factory))) {
|
||||
Subtask<String> subtask1 = scope1.fork(() -> {
|
||||
assertEquals(name.get(), "x"); // child should read "x"
|
||||
|
||||
// rebind name to "y"
|
||||
String grandchildValue = ScopedValue.where(name, "y").call(() -> {
|
||||
try (var scope2 = StructuredTaskScope.open(Joiner.awaitAll(),
|
||||
cf -> cf.withThreadFactory(factory))) {
|
||||
Subtask<String> subtask2 = scope2.fork(() -> {
|
||||
return name.get(); // grandchild should read "y"
|
||||
});
|
||||
scope2.join();
|
||||
return subtask2.get();
|
||||
}
|
||||
});
|
||||
|
||||
assertEquals(name.get(), "x"); // child should read "x"
|
||||
return grandchildValue;
|
||||
});
|
||||
scope1.join();
|
||||
return subtask1.get();
|
||||
}
|
||||
});
|
||||
assertEquals(value, "y");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test exiting a dynamic scope with an open task scope.
|
||||
*/
|
||||
@Test
|
||||
void testStructureViolation1() throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
class Box {
|
||||
StructuredTaskScope<Object, Void> scope;
|
||||
}
|
||||
var box = new Box();
|
||||
try {
|
||||
try {
|
||||
ScopedValue.where(name, "x").run(() -> {
|
||||
box.scope = StructuredTaskScope.open(Joiner.awaitAll());
|
||||
});
|
||||
fail();
|
||||
} catch (StructureViolationException expected) { }
|
||||
|
||||
// underlying flock should be closed and fork should fail to start a thread
|
||||
StructuredTaskScope<Object, Void> scope = box.scope;
|
||||
AtomicBoolean ran = new AtomicBoolean();
|
||||
Subtask<Object> subtask = scope.fork(() -> {
|
||||
ran.set(true);
|
||||
return null;
|
||||
});
|
||||
scope.join();
|
||||
assertEquals(Subtask.State.UNAVAILABLE, subtask.state());
|
||||
assertFalse(ran.get());
|
||||
} finally {
|
||||
StructuredTaskScope<Object, Void> scope = box.scope;
|
||||
if (scope != null) {
|
||||
scope.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test closing a StructuredTaskScope while executing in a dynamic scope.
|
||||
*/
|
||||
@Test
|
||||
void testStructureViolation2() throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
|
||||
ScopedValue.where(name, "x").run(() -> {
|
||||
assertThrows(StructureViolationException.class, scope::close);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test fork when a scoped value is bound after a StructuredTaskScope is created.
|
||||
*/
|
||||
@Test
|
||||
void testStructureViolation3() throws Exception {
|
||||
ScopedValue<String> name = ScopedValue.newInstance();
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
|
||||
ScopedValue.where(name, "x").run(() -> {
|
||||
assertThrows(StructureViolationException.class,
|
||||
() -> scope.fork(() -> "foo"));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test fork when a scoped value is re-bound after a StructuredTaskScope is created.
|
||||
*/
|
||||
@Test
|
||||
void testStructureViolation4() throws Exception {
|
||||
ScopedValue<String> name1 = ScopedValue.newInstance();
|
||||
ScopedValue<String> name2 = ScopedValue.newInstance();
|
||||
|
||||
// rebind
|
||||
ScopedValue.where(name1, "x").run(() -> {
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
|
||||
ScopedValue.where(name1, "y").run(() -> {
|
||||
assertThrows(StructureViolationException.class,
|
||||
() -> scope.fork(() -> "foo"));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// new binding
|
||||
ScopedValue.where(name1, "x").run(() -> {
|
||||
try (var scope = StructuredTaskScope.open(Joiner.awaitAll())) {
|
||||
ScopedValue.where(name2, "y").run(() -> {
|
||||
assertThrows(StructureViolationException.class,
|
||||
() -> scope.fork(() -> "foo"));
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue