[GR-34749] [GR-36413] [GR-36109] [GR-34435] Cleanups.

PullRequest: graal/11032

Author: peter-hofer

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixJavaThreads.java

@@ -29,7 +29,7 @@
  *
  * @see PosixPlatformThreads
  */
-public class PosixJavaThreads {
-    protected PosixJavaThreads() {
+public final class PosixJavaThreads {
+    private PosixJavaThreads() {
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -191,7 +191,7 @@ public static boolean printFatalError(Log log, Pointer sp, CodePointer ip, Regis
          * further errors occur while printing diagnostics.
          */
         if (!fatalErrorState().trySet(log, sp, ip, registerContext, frameHasCalleeSavedRegisters) && !isFatalErrorHandlingThread()) {
-            log.string("Error: printDiagnostics already in progress by another thread.").newline();
+            log.string("Error: printFatalError already in progress by another thread.").newline();
             log.newline();
             return false;
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java

@@ -42,7 +42,6 @@
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
@@ -55,7 +54,6 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.Uninterruptible;
-import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 import com.oracle.svm.util.StringUtil;
@@ -250,11 +248,6 @@ public interface Thunk {
         void invoke();
     }
 
-    /** Prints extensive diagnostic information for a fatal error to the given log. */
-    public static boolean printDiagnostics(Log log, Pointer sp, CodePointer ip) {
-        return SubstrateDiagnostics.printFatalError(log, sp, ip, WordFactory.nullPointer(), false);
-    }
-
     /**
      * Similar to {@link String#split(String)} but with a fixed separator string instead of a
      * regular expression. This avoids making regular expression code reachable.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheckImpl.java

@@ -31,9 +31,6 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import com.oracle.svm.core.CPUFeatureAccess;
-import com.oracle.svm.core.SubstrateTargetDescription;
-import com.oracle.svm.core.SubstrateUtil;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.NumUtil;
@@ -54,6 +51,9 @@
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
 
+import com.oracle.svm.core.CPUFeatureAccess;
+import com.oracle.svm.core.SubstrateTargetDescription;
+import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.jdk.RuntimeSupport;
@@ -92,10 +92,9 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
  * This needs to be a separate class, making this a lambda call or an anonymous class would pull the
  * {@link Feature} hierarchy into the image.
  */
-final class RuntimeCPUFeatureCheckInitializer implements Runnable {
-
+final class RuntimeCPUFeatureCheckInitializer implements RuntimeSupport.Hook {
     @Override
-    public void run() {
+    public void execute(boolean isFirstIsolate) {
         RuntimeCPUFeatureCheckImpl.instance().reinitialize();
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeSupport.java

@@ -163,27 +163,4 @@ private enum InitializationState {
         InProgress,
         Done
     }
-
-    /*
-     * GR-36109: the following methods are for compatibility with legacy code and to be removed.
-     */
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    public void addStartupHook(Runnable hook) {
-        addHook(startupHooks, firstIsolate -> hook.run());
-    }
-
-    @Platforms(Platform.HOSTED_ONLY.class)
-    public void addShutdownHook(Runnable hook) {
-        addHook(shutdownHooks, firstIsolate -> hook.run());
-    }
-
-    public void addInitializationHook(Runnable hook) {
-        addHook(initializationHooks, firstIsolate -> hook.run());
-    }
-
-    public void addTearDownHook(Runnable hook) {
-        addHook(tearDownHooks, firstIsolate -> hook.run());
-    }
-
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java

@@ -34,18 +34,13 @@
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.IsolateThread;
-import org.graalvm.nativeimage.ObjectHandle;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.c.struct.RawStructure;
 
 import com.oracle.svm.core.annotate.AlwaysInline;
 import com.oracle.svm.core.annotate.NeverInline;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.jdk.StackTraceUtils;
 import com.oracle.svm.core.jdk.Target_jdk_internal_misc_VM;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
-import com.oracle.svm.core.util.VMError;
 
 /**
  * Implements operations on {@linkplain Target_java_lang_Thread Java threads}, which are on a higher
@@ -69,14 +64,13 @@
  * @see <a href="https://openjdk.java.net/projects/loom/">Wiki and source code of Project Loom on
  *      which concepts of virtual threads, carrier threads, etc. are modeled</a>
  */
-public class JavaThreads {
+public final class JavaThreads {
     /** For Thread.nextThreadID(). */
     static final AtomicLong threadSeqNumber = new AtomicLong();
     /** For Thread.nextThreadNum(). */
     static final AtomicInteger threadInitNumber = new AtomicInteger();
 
-    @Platforms(Platform.HOSTED_ONLY.class)
-    protected JavaThreads() {
+    private JavaThreads() {
     }
 
     @SuppressFBWarnings(value = "BC", justification = "Cast for @TargetClass")
@@ -325,50 +319,4 @@ public static Object getCurrentThreadLockHelper() {
         }
         return PlatformThreads.lockHelper.get();
     }
-
-    /**
-     *
-     * GR-34749: class {@link PlatformThreads} has been split off from JavaThreads for code specific
-     * to OS threads, but legacy code still subclasses JavaThreads to provide OS-specific
-     * implementations. We install {@link LegacyPlatformThreads} that calls the methods below. These
-     * methods and {@link LegacyPlatformThreads} should be removed once they are no longer needed.
-     *
-     */
-
-    @RawStructure
-    protected interface ThreadStartData extends PlatformThreads.ThreadStartData {
-    }
-
-    @SuppressWarnings("unused")
-    protected void prepareStartData(Thread thread, ThreadStartData startData) {
-        /*
-         * GR-36413: Call PlatformThreads.prepareStart instead. Delete this method and
-         * PlatformThreads.prepareStartData once they are no longer needed.
-         */
-        PlatformThreads.prepareStartData(thread, startData);
-    }
-
-    protected static void exit(Thread thread) {
-        PlatformThreads.exit(thread);
-    }
-
-    @SuppressWarnings("unused")
-    protected static void threadStartRoutine(ObjectHandle threadHandle) {
-        PlatformThreads.threadStartRoutine(threadHandle);
-    }
-
-    @SuppressWarnings("unused")
-    protected void doStartThread(Thread thread, long stackSize) {
-        throw VMError.shouldNotReachHere("Subclass PlatformThreads instead.");
-    }
-
-    @SuppressWarnings("unused")
-    protected void setNativeName(Thread thread, String name) {
-        throw VMError.shouldNotReachHere("Subclass PlatformThreads instead.");
-    }
-
-    @SuppressWarnings("unused")
-    protected void yield() {
-        throw VMError.shouldNotReachHere("Subclass PlatformThreads instead.");
-    }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java

@@ -53,14 +53,12 @@
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawStructure;
-import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.SubstrateDiagnostics;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
-import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.annotate.NeverInline;
 import com.oracle.svm.core.annotate.Uninterruptible;
 import com.oracle.svm.core.heap.Heap;
@@ -603,16 +601,6 @@ protected <T extends ThreadStartData> T prepareStart(Thread thread, int startDat
         return startData;
     }
 
-    /** GR-36413: for compatibility with legacy code, to be removed. Call prepareStart instead. */
-    protected static void prepareStartData(Thread thread, ThreadStartData startData) {
-        startData.setIsolate(CurrentIsolate.getIsolate());
-        startData.setThreadHandle(ObjectHandles.getGlobal().create(thread));
-
-        if (!thread.isDaemon()) {
-            nonDaemonThreads.incrementAndGet();
-        }
-    }
-
     protected void undoPrepareStartOnError(Thread thread, ThreadStartData startData) {
         if (!thread.isDaemon()) {
             undoPrepareNonDaemonStartOnError();
@@ -974,31 +962,3 @@ public void operate() {
         }
     }
 }
-
-final class LegacyPlatformThreads extends PlatformThreads {
-    @Override
-    protected boolean doStartThread(Thread thread, long stackSize) {
-        ImageSingletons.lookup(JavaThreads.class).doStartThread(thread, stackSize);
-        return true;
-    }
-
-    @Override
-    protected void setNativeName(Thread thread, String name) {
-        ImageSingletons.lookup(JavaThreads.class).setNativeName(thread, name);
-    }
-
-    @Override
-    protected void yieldCurrent() {
-        ImageSingletons.lookup(JavaThreads.class).yield();
-    }
-}
-
-@AutomaticFeature
-final class LegacyPlatformThreadsFeature implements Feature {
-    @Override
-    public void duringSetup(DuringSetupAccess access) {
-        if (!ImageSingletons.contains(PlatformThreads.class)) {
-            ImageSingletons.add(PlatformThreads.class, new LegacyPlatformThreads());
-        }
-    }
-}

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java

@@ -774,12 +774,6 @@ public static void assertStatusVM() {
             }
         }
 
-        // This method will be removed in GR-34435.
-        @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
-        public static void setStatusIgnoreSafepoints() {
-            SafepointBehavior.markThreadAsCrashed();
-        }
-
         public static boolean isValidStatus(int status) {
             return status > STATUS_ILLEGAL && status <= MAX_STATUS;
         }