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

8317514: Ensure MemorySegment is initialized before touching NativeMemorySegmentImpl

Browse source 
Co-authored-by: Jorn Vernee <jvernee@openjdk.org>
Reviewed-by: jvernee
This commit is contained in:
Maurizio Cimadamore 2023-10-13 20:51:52 +00:00
parent 9622de2aa8
commit 7cb2e6d65b
12 changed files with 338 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

11
test/jdk/java/foreign/TestByteBuffer.java
View file

@ -69,9 +69,6 @@ import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
import jdk.internal.foreign.HeapMemorySegmentImpl;
import jdk.internal.foreign.MappedMemorySegmentImpl;
import jdk.internal.foreign.NativeMemorySegmentImpl;
import org.testng.SkipException;
import org.testng.annotations.*;
import sun.nio.ch.DirectBuffer;
@ -987,9 +984,9 @@ public class TestByteBuffer {
@DataProvider(name = "bufferSources")
public static Object[][] bufferSources() {
Predicate<MemorySegment> heapTest = segment -> segment instanceof HeapMemorySegmentImpl;
Predicate<MemorySegment> nativeTest = segment -> segment instanceof NativeMemorySegmentImpl;
Predicate<MemorySegment> mappedTest = segment -> segment instanceof MappedMemorySegmentImpl;
Predicate<MemorySegment> heapTest = segment -> !segment.isNative() && !segment.isMapped();
Predicate<MemorySegment> nativeTest = segment -> segment.isNative() && !segment.isMapped();
Predicate<MemorySegment> mappedTest = segment -> segment.isNative() && segment.isMapped();
try (FileChannel channel = FileChannel.open(tempPath, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
return new Object[][]{
{ ByteBuffer.wrap(new byte[256]), heapTest },
@ -1001,7 +998,7 @@ public class TestByteBuffer {
{ ByteBuffer.allocate(256).asReadOnlyBuffer(), heapTest },
{ ByteBuffer.allocateDirect(256).asReadOnlyBuffer(), nativeTest },
{ channel.map(FileChannel.MapMode.READ_WRITE, 0L, 256).asReadOnlyBuffer(),
nativeTest /* this seems to be an existing bug in the BB implementation */ }
mappedTest }
};
} catch (IOException ex) {
throw new ExceptionInInitializerError(ex);

101
test/jdk/java/foreign/TestDeadlock.java Normal file
View file

@ -0,0 +1,101 @@
/*
* 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 id=Arena_allocateFrom
* @run main/othervm/timeout=5 --enable-native-access=ALL-UNNAMED -Xlog:class+init TestDeadlock Arena
*/
/*
* @test id=FileChannel_map
* @run main/othervm/timeout=5 --enable-native-access=ALL-UNNAMED -Xlog:class+init TestDeadlock FileChannel
*/
import java.lang.foreign.*;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.concurrent.CountDownLatch;
public class TestDeadlock {
public static void main(String[] args) throws Throwable {
CountDownLatch latch = new CountDownLatch(2);
Runnable tester = switch (args[0]) {
case "Arena" -> () -> {
Arena arena = Arena.global();
arena.scope(); // init ArenaImpl
ValueLayout.JAVA_INT.byteSize(); // init ValueLayout (and impls)
latch.countDown();
try {
latch.await();
} catch(InterruptedException e) {
throw new RuntimeException(e);
}
// Access ArenaImpl -> NativeMemorySegmentImpl -> MemorySegment
arena.allocateFrom(ValueLayout.JAVA_INT, 42);
};
case "FileChannel" -> () -> {
try {
Arena arena = Arena.global();
Path p = Files.createFile(Path.of("test.out"));
try (FileChannel channel = FileChannel.open(p, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
channel.map(FileChannel.MapMode.READ_WRITE, 0, 4); // create MappedByteBuffer to initialize other things
latch.countDown();
latch.await();
// Access MappedMemorySegmentImpl -> MemorySegment
channel.map(FileChannel.MapMode.READ_WRITE, 0, 4, arena);
}
} catch(InterruptedException | IOException e) {
throw new RuntimeException(e);
}
};
default -> throw new IllegalArgumentException("Unknown test selection: " + args[0]);
};
Thread t1 = Thread.ofPlatform().start(tester);
Thread t2 = Thread.ofPlatform().start(() -> {
latch.countDown();
try {
latch.await();
} catch(InterruptedException e) {
throw new RuntimeException(e);
}
// Access MemorySegment -> NativeMemorySegmentImpl
MemorySegment.ofAddress(42);
});
// wait for potential deadlock
t1.join();
t2.join();
// all good
}
}

3
test/jdk/java/foreign/TestSegmentAllocators.java
View file

@ -30,7 +30,6 @@
import java.lang.foreign.*;
import jdk.internal.foreign.NativeMemorySegmentImpl;
import org.testng.annotations.*;
import java.lang.foreign.Arena;
@ -239,7 +238,7 @@ public class TestSegmentAllocators {
assertThrows(UnsupportedOperationException.class, segment::isLoaded);
assertThrows(UnsupportedOperationException.class, segment::force);
assertFalse(segment.isMapped());
assertEquals(segment.isNative(), segment instanceof NativeMemorySegmentImpl);
assertTrue(segment.isNative());
}
}
}