[GR-36676] Remove the option to do the reference handling in a regula…

…r Java thread. PullRequest: graal/11167
oracle · Mar 26, 2022 · 015b140 · 015b140
2 parents b398106 + 79ab826
commit 015b140
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 35 deletions.
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Isolates.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Isolates.java
@@ -140,7 +140,7 @@ public Builder auxiliaryImageReservedSpaceSize(UnsignedWord size) {
             /**
              * Appends an isolate argument. The syntax for arguments is the same as the one that is
              * used on the command-line when starting Native Image (e.g., {@code
-             * -XX:+UseReferenceHandlerThread}). If the same argument is added multiple times, the
+             * -XX:+AutomaticReferenceHandling}). If the same argument is added multiple times, the
              * last specified value will be used.
              *
              * @since 22.1

diff --git a/...atevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/...atevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -162,7 +162,6 @@ private void collect(GCCause cause, boolean forceFullGC) {
             if (outOfMemory) {
                 throw OUT_OF_MEMORY_ERROR;
             }
-            doReferenceHandlingInRegularThread();
         }
     }
 
@@ -1163,13 +1162,6 @@ private void finishCollection() {
         collectionInProgress = false;
     }
 
-    // This method will be removed as soon as possible, see GR-36676.
-    static void doReferenceHandlingInRegularThread() {
-        if (ReferenceHandler.useRegularJavaThread() && !VMOperation.isInProgress() && PlatformThreads.isCurrentAssigned()) {
-            doReferenceHandling();
-        }
-    }
-
     /**
      * Inside a VMOperation, we are not allowed to do certain things, e.g., perform synchronization
      * (because it can deadlock when a lock is held outside the VMOperation). Similar restrictions

diff --git a/...racle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/...racle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -203,7 +203,6 @@ private static Object slowPathNewInstance(Word objectHeader) {
      * </pre>
      */
     private static void runSlowPathHooks() {
-        GCImpl.doReferenceHandlingInRegularThread();
         GCImpl.getPolicy().updateSizeParameters();
     }
 

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
@@ -56,7 +56,7 @@
  */
 public class IsolateArgumentParser {
     private static final RuntimeOptionKey<?>[] OPTIONS = {SubstrateGCOptions.MinHeapSize, SubstrateGCOptions.MaxHeapSize, SubstrateGCOptions.MaxNewSize,
-                    SubstrateOptions.ConcealedOptions.UseReferenceHandlerThread, SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling};
+                    SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling};
     private static final int OPTION_COUNT = OPTIONS.length;
     private static final CGlobalData<CCharPointer> OPTION_NAMES = CGlobalDataFactory.createBytes(IsolateArgumentParser::createOptionNames);
     private static final CGlobalData<CIntPointer> OPTION_NAME_POSITIONS = CGlobalDataFactory.createBytes(IsolateArgumentParser::createOptionNamePosition);
@@ -73,11 +73,6 @@ public class IsolateArgumentParser {
     public IsolateArgumentParser() {
     }
 
-    @Fold
-    public static boolean isSupported() {
-        return ImageSingletons.contains(IsolateArgumentParser.class);
-    }
-
     @Fold
     public static IsolateArgumentParser singleton() {
         return ImageSingletons.lookup(IsolateArgumentParser.class);

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -643,10 +643,6 @@ public Boolean getValue(OptionValues values) {
         @Option(help = "Determines if VM operations should be executed in a dedicated thread.", type = OptionType.Expert)//
         public static final HostedOptionKey<Boolean> UseDedicatedVMOperationThread = new HostedOptionKey<>(false);
 
-        /** Use {@link ReferenceHandler#useDedicatedThread()} instead. */
-        @Option(help = "Populate reference queues in a separate thread rather than after a garbage collection.", type = OptionType.Expert) //
-        public static final RuntimeOptionKey<Boolean> UseReferenceHandlerThread = new ImmutableRuntimeOptionKey<>(true);
-
         /** Use {@link ReferenceHandler#isExecutedManually()} instead. */
         @Option(help = "Determines if the reference handling is executed automatically or manually.", type = OptionType.Expert) //
         public static final RuntimeOptionKey<Boolean> AutomaticReferenceHandling = new ImmutableRuntimeOptionKey<>(true);

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandler.java
@@ -34,28 +34,16 @@
 
 public final class ReferenceHandler {
     public static boolean useDedicatedThread() {
-        if (ReferenceHandlerThread.isSupported()) {
-            int useReferenceHandlerThread = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.UseReferenceHandlerThread);
-            int automaticReferenceHandling = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling);
-            return IsolateArgumentParser.getBooleanOptionValue(useReferenceHandlerThread) && IsolateArgumentParser.getBooleanOptionValue(automaticReferenceHandling);
-        }
-        return false;
-    }
-
-    public static boolean useRegularJavaThread() {
-        int useReferenceHandlerThread = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.UseReferenceHandlerThread);
         int automaticReferenceHandling = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling);
-        return (!ReferenceHandlerThread.isSupported() || !IsolateArgumentParser.getBooleanOptionValue(useReferenceHandlerThread)) &&
-                        IsolateArgumentParser.getBooleanOptionValue(automaticReferenceHandling);
+        return ReferenceHandlerThread.isSupported() && IsolateArgumentParser.getBooleanOptionValue(automaticReferenceHandling);
     }
 
     public static boolean isExecutedManually() {
-        int automaticReferenceHandling = IsolateArgumentParser.getOptionIndex(SubstrateOptions.ConcealedOptions.AutomaticReferenceHandling);
-        return !IsolateArgumentParser.getBooleanOptionValue(automaticReferenceHandling);
+        return !useDedicatedThread();
     }
 
     public static void processPendingReferencesInRegularThread() {
-        assert !useDedicatedThread();
+        assert isExecutedManually();
 
         /*
          * We might be running in a user thread that is close to a stack overflow, so enable the