Skip to content

[GR-67752] Small cleanups for "Cleaner"-related code. #11773

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

Merged
merged 1 commit into from
Jul 26, 2025
Merged

[GR-67752] Small cleanups for "Cleaner"-related code. #11773

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
4 changes: 3 additions & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import com.oracle.svm.core.stack.StackOverflowCheck;
import com.oracle.svm.core.util.VMError;

import jdk.internal.ref.CleanerFactory;

public final class ReferenceHandler {
public static boolean useDedicatedThread() {
int automaticReferenceHandling = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling);
Expand Down Expand Up @@ -68,7 +70,7 @@ static void processCleaners() {
// Note: (sun.misc|jdk.internal).Cleaner objects are invoked in pending reference processing

// Process the JDK's common cleaner, additional cleaners start their own threads
Target_java_lang_ref_Cleaner commonCleaner = Target_jdk_internal_ref_CleanerFactory.cleaner();
Target_java_lang_ref_Cleaner commonCleaner = SubstrateUtil.cast(CleanerFactory.cleaner(), Target_java_lang_ref_Cleaner.class);
Reference<?> ref = commonCleaner.impl.queue.poll();
while (ref != null) {
try {
Expand Down
8 changes: 1 addition & 7 deletions ...vm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Cleaner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@
@TargetClass(className = "java.lang.ref.Cleaner")
public final class Target_java_lang_ref_Cleaner {
@Alias//
public Target_jdk_internal_ref_CleanerImpl impl;
}

@TargetClass(className = "jdk.internal.ref.CleanerFactory")
final class Target_jdk_internal_ref_CleanerFactory {
@Alias
public static native Target_java_lang_ref_Cleaner cleaner();
Target_jdk_internal_ref_CleanerImpl impl;
}

@TargetClass(className = "java.lang.ref.Cleaner$Cleanable")
Expand Down