[GR-51505] [GR-51751] Cleanups and minor fixes.

PullRequest: graal/16792

Author: christianhaeubl

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

@@ -210,10 +210,7 @@ public static void verifyOptionValues() {
     }
 
     private static boolean shouldValidate(RuntimeOptionKey<?> option) {
-        if (!option.hasBeenSet()) {
-            /* Workaround for one specific Truffle language that does something weird. */
-            return false;
-        } else if (SubstrateOptions.UseSerialGC.getValue()) {
+        if (SubstrateOptions.UseSerialGC.getValue()) {
             /* The serial GC supports changing the heap size at run-time to some degree. */
             return option != SubstrateGCOptions.MinHeapSize && option != SubstrateGCOptions.MaxHeapSize && option != SubstrateGCOptions.MaxNewSize;
         }

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

@@ -69,8 +69,10 @@
 import com.oracle.svm.core.jdk.RuntimeSupport;
 import com.oracle.svm.core.jni.JNIJavaVMList;
 import com.oracle.svm.core.jni.functions.JNIFunctionTables;
+import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.PlatformThreads;
+import com.oracle.svm.core.thread.ThreadingSupportImpl;
 import com.oracle.svm.core.thread.VMThreads;
 import com.oracle.svm.core.thread.VMThreads.OSThreadHandle;
 import com.oracle.svm.core.util.UserError;
@@ -244,22 +246,32 @@ private static int runCore0() {
 
     @Uninterruptible(reason = "The caller initialized the thread state, so the callees do not need to be uninterruptible.", calleeMustBe = false)
     private static void runShutdown() {
+        ThreadingSupportImpl.pauseRecurringCallback("Recurring callbacks can't be executed during shutdown.");
         runShutdown0();
     }
 
     private static void runShutdown0() {
-        PlatformThreads.ensureCurrentAssigned("DestroyJavaVM", null, false);
+        try {
+            PlatformThreads.ensureCurrentAssigned("DestroyJavaVM", null, false);
+        } catch (Throwable e) {
+            Log.log().string("PlatformThreads.ensureCurrentAssigned() failed during shutdown: ").exception(e).newline();
+            return;
+        }
 
-        // Shutdown sequence: First wait for all non-daemon threads to exit.
+        /* Wait for all non-daemon threads to exit. */
         PlatformThreads.singleton().joinAllNonDaemons();
 
-        /*
-         * Run shutdown hooks (both our own hooks and application-registered hooks) and teardown
-         * hooks. Note that this can start new non-daemon threads. We are not responsible to wait
-         * until they have exited.
-         */
-        RuntimeSupport.getRuntimeSupport().shutdown();
-        RuntimeSupport.executeTearDownHooks();
+        try {
+            /*
+             * Run shutdown hooks (both our own hooks and application-registered hooks) and teardown
+             * hooks. Note that this can start new non-daemon threads. We are not responsible to
+             * wait until they have exited.
+             */
+            RuntimeSupport.getRuntimeSupport().shutdown();
+            RuntimeSupport.executeTearDownHooks();
+        } catch (Throwable e) {
+            Log.log().string("Exception occurred while executing shutdown hooks: ").exception(e).newline();
+        }
     }
 
     @Uninterruptible(reason = "Thread state not set up yet.")
@@ -278,6 +290,7 @@ private static int doRun(int argc, CCharPointerPointer argv) {
         try {
             CPUFeatureAccess cpuFeatureAccess = ImageSingletons.lookup(CPUFeatureAccess.class);
             cpuFeatureAccess.verifyHostSupportsArchitectureEarlyOrExit();
+
             // Create the isolate and attach the current C thread as the main Java thread.
             EnterCreateIsolateWithCArgumentsPrologue.enter(argc, argv);
             assert !VMThreads.wasStartedByCurrentIsolate(CurrentIsolate.getCurrentThread()) : "re-attach would cause issues otherwise";

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

@@ -373,8 +373,8 @@ protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, Boolean o
     @Option(help = "The size of each thread stack at run-time, in bytes.", type = OptionType.User)//
     public static final RuntimeOptionKey<Long> StackSize = new RuntimeOptionKey<>(0L);
 
-    @Option(help = "The size of each internal thread stack, in bytes.", type = OptionType.Expert)//
-    public static final HostedOptionKey<Long> InternalThreadStackSize = new HostedOptionKey<>(2L * 1024 * 1024);
+    @Option(help = "Deprecated, has no effect.", deprecated = true) //
+    public static final HostedOptionKey<Long> InternalThreadStackSize = new HostedOptionKey<>(0L);
 
     /**
      * Cached value of {@link ConcealedOptions#MaxJavaStackTraceDepth}. Also used as default value.

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

@@ -433,8 +433,9 @@ static void assignCurrent(Thread thread) {
         }
 
         /*
-         * First of all, ensure we are in RUNNABLE state. If !manuallyStarted, we race with the
-         * thread that launched us to set the status and we could still be in status NEW.
+         * First of all, ensure we are in RUNNABLE state. If this thread was started by the current
+         * isolate, we race with the thread that launched us to set the status and we could still be
+         * in status NEW.
          */
         setThreadStatus(thread, ThreadStatus.RUNNABLE);
         assignCurrent0(thread);