Skip to content

8359174: tools/jlink/JLink20000Packages.java timed out #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

8359174: tools/jlink/JLink20000Packages.java timed out #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 76 additions & 65 deletions test/jdk/tools/jlink/JLink20000Packages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,94 +21,86 @@
* questions.
*/

import tests.JImageGenerator;

import java.io.BufferedOutputStream;
import java.lang.classfile.ClassFile;
import java.lang.classfile.attribute.ModuleAttribute;
import java.lang.constant.ClassDesc;
import java.lang.constant.MethodTypeDesc;
import java.lang.constant.ModuleDesc;
import java.lang.constant.PackageDesc;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.StringJoiner;
import java.util.spi.ToolProvider;
import java.util.HashSet;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;

import tests.JImageGenerator;
import static java.lang.classfile.ClassFile.ACC_MANDATED;
import static java.lang.classfile.ClassFile.ACC_PUBLIC;
import static java.lang.classfile.ClassFile.ACC_STATIC;
import static java.lang.constant.ConstantDescs.CD_String;
import static java.lang.constant.ConstantDescs.CD_void;

/*
* @test
* @summary Make sure that ~20000 packages in a uber jar can be linked using jlink. Now that
* pagination is in place, the limitation is on the constant pool size, not number
* of packages.
* @bug 8321413
* @library ../lib
* @enablePreview
* @library ../lib /test/lib
* @modules java.base/jdk.internal.jimage
* jdk.jlink/jdk.tools.jlink.internal
* jdk.jlink/jdk.tools.jlink.plugin
* jdk.jlink/jdk.tools.jmod
* jdk.jlink/jdk.tools.jimage
* jdk.compiler
* @build tests.*
* @run main/othervm -Xmx1g -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink20000Packages
* @run main/othervm -Xlog:init=debug -XX:+UnlockDiagnosticVMOptions -XX:+BytecodeVerificationLocal JLink20000Packages
*/
public class JLink20000Packages {
private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac")
.orElseThrow(() -> new RuntimeException("javac tool not found"));

static void report(String command, String[] args) {
System.out.println(command + " " + String.join(" ", Arrays.asList(args)));
}

static void javac(String[] args) {
report("javac", args);
JAVAC_TOOL.run(System.out, System.err, args);
}
private static final ClassDesc CD_System = ClassDesc.of("java.lang.System");
private static final ClassDesc CD_PrintStream = ClassDesc.of("java.io.PrintStream");
private static final MethodTypeDesc MTD_void_String = MethodTypeDesc.of(CD_void, CD_String);

public static void main(String[] args) throws Exception {
Path src = Paths.get("bug8321413");
String moduleName = "bug8321413x";
Path src = Paths.get(moduleName);
Files.createDirectories(src);
Path jarPath = src.resolve(moduleName +".jar");
Path imageDir = src.resolve("out-jlink");
Path mainModulePath = src.resolve("bug8321413x");

StringJoiner mainModuleInfoContent = new StringJoiner(";\n exports ", "module bug8321413x {\n exports ", ";\n}");

for (int i = 0; i < 20000; i++) {
String packageName = "p" + i;
String className = "C" + i;

Path packagePath = Files.createDirectories(mainModulePath.resolve(packageName));

StringBuilder classContent = new StringBuilder("package ");
classContent.append(packageName).append(";\n");
classContent.append("class ").append(className).append(" {}\n");
Files.writeString(packagePath.resolve(className + ".java"), classContent.toString());

mainModuleInfoContent.add(packageName);
// Generate module with 20000 classes in unique packages
try (JarOutputStream out = new JarOutputStream(new BufferedOutputStream(Files.newOutputStream(jarPath)))) {
Set<String> packageNames = new HashSet<>();
for (int i = 0; i < 20_000; i++) {
String packageName = "p" + i;
packageNames.add(packageName);

// Generate a class file for this package
String className = "C" + i;
byte[] classData = ClassFile.of().build(ClassDesc.of(packageName, className), cb -> {});
out.putNextEntry(new JarEntry(packageName + "/" + className +".class"));
out.write(classData);
}

// Write the main class
out.putNextEntry(new JarEntry("testpackage/JLink20000PackagesTest.class"));
out.write(generateMainClass());
packageNames.add("testpackage");

// Write the module descriptor
byte[] moduleInfo = ClassFile.of().buildModule(ModuleAttribute.of(
ModuleDesc.of(moduleName), mab -> {
mab.requires(ModuleDesc.of("java.base"), ACC_MANDATED, null);
packageNames.forEach(pkgName -> mab.exports(PackageDesc.of(pkgName), 0));
}));
out.putNextEntry(new JarEntry("module-info.class"));
out.write(moduleInfo);
}

// create module reading the generated modules
Path mainModuleInfo = mainModulePath.resolve("module-info.java");
Files.writeString(mainModuleInfo, mainModuleInfoContent.toString());

Path mainClassDir = mainModulePath.resolve("testpackage");
Files.createDirectories(mainClassDir);

Files.writeString(mainClassDir.resolve("JLink20000PackagesTest.java"), """
package testpackage;

public class JLink20000PackagesTest {
public static void main(String[] args) throws Exception {
System.out.println("JLink20000PackagesTest started.");
}
}
""");

String out = src.resolve("out").toString();
javac(new String[]{
"-d", out,
"--module-source-path", src.toString(),
"--module", "bug8321413x"
});

JImageGenerator.getJLinkTask()
.modulePath(out)
.output(imageDir)
.addMods("bug8321413x")
.addJars(jarPath)
.addMods(moduleName)
.call()
.assertSuccess();

Expand All @@ -117,13 +109,32 @@ public static void main(String[] args) throws Exception {

ProcessBuilder processBuilder = new ProcessBuilder(bin.toString(),
"-XX:+UnlockDiagnosticVMOptions",
// Option is useful to verify build image
"-XX:+BytecodeVerificationLocal",
"-m", "bug8321413x/testpackage.JLink20000PackagesTest");
"-m", moduleName + "/testpackage.JLink20000PackagesTest");
processBuilder.inheritIO();
processBuilder.directory(binDir.toFile());
Process process = processBuilder.start();
int exitCode = process.waitFor();
if (exitCode != 0)
throw new AssertionError("JLink20000PackagesTest failed to launch");
}

/**
* Generate test class with main() does
* System.out.println("JLink20000PackagesTest started.");
*/
private static byte[] generateMainClass() {
return ClassFile.of().build(ClassDesc.of("testpackage", "JLink20000PackagesTest"),
cb -> {
cb.withMethod("main", MethodTypeDesc.of(CD_void, CD_String.arrayType()),
ACC_PUBLIC | ACC_STATIC, mb -> {
mb.withCode(cob -> cob.getstatic(CD_System, "out", CD_PrintStream)
.ldc("JLink20000PackagesTest started.")
.invokevirtual(CD_PrintStream, "println", MTD_void_String)
.return_()
);
});
});
}
}
6 changes: 3 additions & 3 deletions test/jdk/tools/lib/tests/JImageGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 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
Expand Down Expand Up @@ -423,7 +423,7 @@ private String modulePath() {
// This is expect FIRST jmods THEN jars, if you change this, some tests could fail
String jmods = toPath(this.jmods);
String jars = toPath(this.jars);
return linkableRuntime ? jars : jmods + File.pathSeparator + jars;
return (linkableRuntime || jmods.isEmpty()) ? jars : jmods + File.pathSeparator + jars;
}

private String toPath(List<Path> paths) {
Expand Down Expand Up @@ -654,7 +654,7 @@ private String modulePath() {
// This is expect FIRST jmods THEN jars, if you change this, some tests could fail
String jmods = toPath(this.jmods);
String jars = toPath(this.jars);
return jmods + File.pathSeparator + jars;
return jmods.isEmpty() ? jars : jmods + File.pathSeparator + jars;
}

private String toPath(List<Path> paths) {
Expand Down