infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 14:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8360131: Remove use of soon-to-be-removed APIs by CTW framework

Browse Source 
Reviewed-by: liach, thartmann
This commit is contained in:
David Beaumont 2025-06-24 08:09:53 +00:00 committed by Tobias Hartmann
parent 54fec2b98b
commit fdfc557878
2 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJimageEntry.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 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
@ -23,13 +23,19 @@
package sun.hotspot.tools.ctw;
import jdk.internal.jimage.ImageLocation;
import jdk.internal.jimage.ImageReader;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.FileSystem;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.spi.FileSystemProvider;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;
/**
@ -39,17 +45,21 @@ public class ClassPathJimageEntry extends PathHandler.PathEntry {
@Override
protected Stream<String> classes() {
return Arrays.stream(reader.getEntryNames())
.filter(name -> name.endsWith(".class"))
.filter(name -> !name.endsWith("module-info.class"))
.map(ClassPathJimageEntry::toFileName)
.map(Utils::fileNameToClassName);
}
private static String toFileName(String name) {
final char nameSeparator = '/';
assert name.charAt(0) == nameSeparator : name;
return name.substring(name.indexOf(nameSeparator, 1) + 1);
Path modulesRoot = jrtFileSystem.getPath("/modules");
List<String> classNames = new ArrayList<>();
FileVisitor<Path> collectClassNames = new SimpleFileVisitor<>() {
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) {
classNames.add(Utils.fileNameToClassName(modulesRoot.relativize(path).toString()));
return FileVisitResult.CONTINUE;
}
};
try {
Files.walkFileTree(modulesRoot, collectClassNames);
} catch (IOException e) {
throw new Error(e);
}
return classNames.stream();
}
@Override
@ -60,7 +70,7 @@ public class ClassPathJimageEntry extends PathHandler.PathEntry {
@Override
public void close() {
try {
reader.close();
jrtFileSystem.close();
} catch (IOException e) {
throw new Error("error on closing reader for " + root + " : "
+ e.getMessage(), e);
@ -69,7 +79,7 @@ public class ClassPathJimageEntry extends PathHandler.PathEntry {
}
}
private final ImageReader reader;
private final FileSystem jrtFileSystem;
public ClassPathJimageEntry(Path root) {
super(root);
@ -77,7 +87,11 @@ public class ClassPathJimageEntry extends PathHandler.PathEntry {
throw new Error(root + " image file not found");
}
try {
reader = ImageReader.open(root);
jrtFileSystem = FileSystemProvider.installedProviders().stream()
.filter(p -> "jrt".equals(p.getScheme()))
.findFirst()
.orElseThrow(() -> new Error("cannot find JRT filesystem for " + root))
.newFileSystem(root, Map.of());
} catch (IOException e) {
throw new Error("can not open " + root + " : " + e.getMessage(), e);
}
@ -85,14 +99,19 @@ public class ClassPathJimageEntry extends PathHandler.PathEntry {
@Override
protected byte[] findByteCode(String name) {
String resource = Utils.classNameToFileName(name);
for (String m : reader.getModuleNames()) {
ImageLocation location = reader.findLocation(m, resource);
if (location != null) {
return reader.getResource(location);
// Relative path to search for inside each /modules/<module> directory.
Path resourcePath = jrtFileSystem.getPath(Utils.classNameToFileName(name));
Path modulesRoot = jrtFileSystem.getPath("/modules");
try (DirectoryStream<Path> modules = Files.newDirectoryStream(modulesRoot)) {
for (Path module : modules) {
Path p = module.resolve(resourcePath);
if (Files.isRegularFile(p)) {
return Files.readAllBytes(p);
}
}
} catch (IOException e) {
throw new RuntimeException(e);
}
return null;
}
}

12
test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 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
@ -186,10 +186,10 @@ public class Utils {
}
/**
* Converts the filename to classname.
* Converts the {@code /}-separated filename to its corresponding class name.
*
* @param filename filename to convert
* @return corresponding classname
* @return corresponding class name
* @throws AssertionError if filename isn't valid filename for class file -
* {@link #isClassFile(String)}
*/
@ -200,6 +200,12 @@ public class Utils {
.replace(nameSeparator, '.');
}
/**
* Converts a fully qualified class name to a {@code /}-separated filename.
*
* @param classname fully qualified class name to convert
* @return corresponding filename
*/
public static String classNameToFileName(String classname) {
return classname.replace('.', '/')
.concat(CLASSFILE_EXT);