Split class PlatformThreads off from JavaThreads.

Author: peter-hofer

substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java

@@ -28,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets;
 import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.core.common.NumUtil;
 import org.graalvm.compiler.core.common.SuppressFBWarnings;
@@ -58,6 +57,7 @@
 import com.oracle.svm.core.genscavenge.ThreadLocalAllocation.Descriptor;
 import com.oracle.svm.core.genscavenge.UnalignedHeapChunk.UnalignedHeader;
 import com.oracle.svm.core.genscavenge.remset.RememberedSet;
+import com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets;
 import com.oracle.svm.core.heap.GC;
 import com.oracle.svm.core.heap.Heap;
 import com.oracle.svm.core.heap.NoAllocationVerifier;

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

@@ -68,25 +68,25 @@
 import com.oracle.svm.core.posix.headers.linux.LinuxPthread;
 import com.oracle.svm.core.posix.pthread.PthreadConditionUtils;
 import com.oracle.svm.core.stack.StackOverflowCheck;
-import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.ParkEvent;
 import com.oracle.svm.core.thread.ParkEvent.ParkEventFactory;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.VMError;
 
-public final class PosixJavaThreads extends JavaThreads {
+public final class PosixPlatformThreads extends PlatformThreads {
 
     @SuppressFBWarnings(value = "BC", justification = "Cast for @TargetClass")
     private static Target_java_lang_Thread toTarget(Thread thread) {
         return Target_java_lang_Thread.class.cast(thread);
     }
 
     @Platforms(HOSTED_ONLY.class)
-    PosixJavaThreads() {
+    PosixPlatformThreads() {
     }
 
     @Override
-    protected boolean startOSThread(Thread thread, long stackSize) {
+    protected boolean doStartThread(Thread thread, long stackSize) {
         pthread_attr_t attributes = StackValue.get(pthread_attr_t.class);
         if (Pthread.pthread_attr_init(attributes) != 0) {
             return false;
@@ -112,7 +112,7 @@ protected boolean startOSThread(Thread thread, long stackSize) {
             ThreadStartData startData = prepareStart(thread, SizeOf.get(ThreadStartData.class));
 
             Pthread.pthread_tPointer newThread = StackValue.get(Pthread.pthread_tPointer.class);
-            if (Pthread.pthread_create(newThread, attributes, PosixJavaThreads.pthreadStartRoutine.getFunctionPointer(), startData) != 0) {
+            if (Pthread.pthread_create(newThread, attributes, PosixPlatformThreads.pthreadStartRoutine.getFunctionPointer(), startData) != 0) {
                 undoPrepareStartOnError(thread, startData);
                 return false;
             }
@@ -168,17 +168,17 @@ protected void setNativeName(Thread thread, String name) {
                 assert thread == Thread.currentThread() : "Darwin only allows setting the name of the current thread";
                 DarwinPthread.pthread_setname_np(threadNameHolder.get());
             } else {
-                VMError.unsupportedFeature("PosixJavaThreads.setNativeName on unknown OS");
+                VMError.unsupportedFeature("PosixPlatformThreads.setNativeName on unknown OS");
             }
         }
     }
 
     @Override
-    protected void platformYield() {
+    protected void yieldCurrent() {
         Sched.sched_yield();
     }
 
-    private static final CEntryPointLiteral<CFunctionPointer> pthreadStartRoutine = CEntryPointLiteral.create(PosixJavaThreads.class, "pthreadStartRoutine", ThreadStartData.class);
+    private static final CEntryPointLiteral<CFunctionPointer> pthreadStartRoutine = CEntryPointLiteral.create(PosixPlatformThreads.class, "pthreadStartRoutine", ThreadStartData.class);
 
     private static class PthreadStartRoutinePrologue implements CEntryPointOptions.Prologue {
         private static final CGlobalData<CCharPointer> errorMessage = CGlobalDataFactory.createCString("Failed to attach a newly launched thread.");
@@ -217,7 +217,9 @@ final class Target_java_lang_Thread {
     @Inject @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
     boolean hasPthreadIdentifier;
 
-    /** Every thread started by {@link PosixJavaThreads#startOSThread} has an opaque pthread_t. */
+    /**
+     * Every thread started by {@link PosixPlatformThreads#doStartThread} has an opaque pthread_t.
+     */
     @Inject @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
     Pthread.pthread_t pthreadIdentifier;
 }
@@ -334,7 +336,7 @@ public ParkEvent create() {
 class PosixThreadsFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(JavaThreads.class, new PosixJavaThreads());
+        ImageSingletons.add(PlatformThreads.class, new PosixPlatformThreads());
         ImageSingletons.add(ParkEventFactory.class, new PosixParkEventFactory());
     }
 }

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/Target_jdk_internal_misc_Signal.java

@@ -40,7 +40,7 @@
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.jdk.Jvm;
 import com.oracle.svm.core.jdk.RuntimeSupport;
-import com.oracle.svm.core.thread.JavaThreads;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.core.windows.headers.WinBase;
 
@@ -76,7 +76,7 @@ class SignalDispatcher implements Runnable {
     /** A thread (in the image heap) to dispatch signals as they are raised. */
     private static final Thread signalDispatcherThread;
     static {
-        signalDispatcherThread = new Thread(JavaThreads.singleton().systemGroup,
+        signalDispatcherThread = new Thread(PlatformThreads.singleton().systemGroup,
                         new SignalDispatcher(), "Signal Dispatcher");
         signalDispatcherThread.setPriority(NEAR_MAX_PRIORITY);
         signalDispatcherThread.setDaemon(true);

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsJavaThreads.java renamed to substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsPlatformThreads.java

@@ -53,23 +53,23 @@
 import com.oracle.svm.core.c.function.CEntryPointSetup.LeaveDetachThreadEpilogue;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.stack.StackOverflowCheck;
-import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.ParkEvent;
 import com.oracle.svm.core.thread.ParkEvent.ParkEventFactory;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.util.TimeUtils;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.core.windows.headers.Process;
 import com.oracle.svm.core.windows.headers.SynchAPI;
 import com.oracle.svm.core.windows.headers.WinBase;
 
 @Platforms(Platform.WINDOWS.class)
-public final class WindowsJavaThreads extends JavaThreads {
+public final class WindowsPlatformThreads extends PlatformThreads {
     @Platforms(HOSTED_ONLY.class)
-    WindowsJavaThreads() {
+    WindowsPlatformThreads() {
     }
 
     @Override
-    protected boolean startOSThread(Thread thread, long stackSize) {
+    protected boolean doStartThread(Thread thread, long stackSize) {
         int threadStackSize = (int) stackSize;
         int initFlag = Process.CREATE_SUSPENDED();
 
@@ -82,7 +82,7 @@ protected boolean startOSThread(Thread thread, long stackSize) {
 
         CIntPointer osThreadID = StackValue.get(CIntPointer.class);
         WinBase.HANDLE osThreadHandle = Process._beginthreadex(WordFactory.nullPointer(), threadStackSize,
-                        WindowsJavaThreads.osThreadStartRoutine.getFunctionPointer(), startData, initFlag, osThreadID);
+                        WindowsPlatformThreads.osThreadStartRoutine.getFunctionPointer(), startData, initFlag, osThreadID);
         if (osThreadHandle.isNull()) {
             undoPrepareStartOnError(thread, startData);
             return false;
@@ -103,7 +103,7 @@ protected void setNativeName(Thread thread, String name) {
     }
 
     @Override
-    protected void platformYield() {
+    protected void yieldCurrent() {
         Process.SwitchToThread();
     }
 
@@ -117,7 +117,7 @@ interface WindowsThreadStartData extends ThreadStartData {
         void setOSThreadHandle(WinBase.HANDLE osHandle);
     }
 
-    private static final CEntryPointLiteral<CFunctionPointer> osThreadStartRoutine = CEntryPointLiteral.create(WindowsJavaThreads.class, "osThreadStartRoutine", WindowsThreadStartData.class);
+    private static final CEntryPointLiteral<CFunctionPointer> osThreadStartRoutine = CEntryPointLiteral.create(WindowsPlatformThreads.class, "osThreadStartRoutine", WindowsThreadStartData.class);
 
     private static class OSThreadStartRoutinePrologue implements CEntryPointOptions.Prologue {
         private static final CGlobalData<CCharPointer> errorMessage = CGlobalDataFactory.createCString("Failed to attach a newly launched thread.");
@@ -243,7 +243,7 @@ public ParkEvent create() {
 class WindowsThreadsFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(JavaThreads.class, new WindowsJavaThreads());
+        ImageSingletons.add(PlatformThreads.class, new WindowsPlatformThreads());
         ImageSingletons.add(ParkEventFactory.class, new WindowsParkEventFactory());
     }
 }

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

@@ -59,6 +59,7 @@
 import com.oracle.svm.core.jdk.RuntimeSupport;
 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.util.Counter;
 
 import jdk.vm.ci.code.Architecture;
@@ -164,7 +165,7 @@ public static int runCore() {
             /*
              * Shutdown sequence: First wait for all non-daemon threads to exit.
              */
-            JavaThreads.singleton().joinAllNonDaemons();
+            PlatformThreads.singleton().joinAllNonDaemons();
             /*
              * Run shutdown hooks (both our own hooks and application-registered hooks. Note that
              * this can start new non-daemon threads. We are not responsible to wait until they have

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

@@ -78,7 +78,7 @@
 import com.oracle.svm.core.stack.ThreadStackPrinter.StackFramePrintVisitor;
 import com.oracle.svm.core.stack.ThreadStackPrinter.Stage0StackFramePrintVisitor;
 import com.oracle.svm.core.stack.ThreadStackPrinter.Stage1StackFramePrintVisitor;
-import com.oracle.svm.core.thread.JavaThreads;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.thread.VMOperation;
 import com.oracle.svm.core.thread.VMOperationControl;
 import com.oracle.svm.core.thread.VMThreads;
@@ -658,7 +658,7 @@ public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLev
                     log.string(" (").string(SafepointBehavior.toString(safepointBehavior)).string(")");
 
                     if (allowJavaHeapAccess) {
-                        Thread threadObj = JavaThreads.fromVMThread(thread);
+                        Thread threadObj = PlatformThreads.fromVMThread(thread);
                         log.string(" \"").string(threadObj.getName()).string("\" - ").zhex(Word.objectToUntrackedPointer(threadObj));
                         if (threadObj != null && threadObj.isDaemon()) {
                             log.string(", daemon");

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

@@ -46,8 +46,8 @@
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.stack.JavaStackWalker;
 import com.oracle.svm.core.stack.ThreadStackPrinter.StackFramePrintVisitor;
-import com.oracle.svm.core.thread.JavaThreads;
 import com.oracle.svm.core.thread.JavaVMOperation;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.thread.VMThreads;
 
 import sun.misc.Signal;
@@ -123,7 +123,7 @@ public void handle(Signal arg0) {
     }
 
     private static void dumpStack(Log log, IsolateThread vmThread) {
-        Thread javaThread = JavaThreads.fromVMThread(vmThread);
+        Thread javaThread = PlatformThreads.fromVMThread(vmThread);
         if (javaThread != null) {
             log.character('"').string(javaThread.getName()).character('"');
             log.string(" #").signed(javaThread.getId());

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointActions.java

@@ -31,7 +31,7 @@
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.annotate.Uninterruptible;
-import com.oracle.svm.core.thread.JavaThreads;
+import com.oracle.svm.core.thread.PlatformThreads;
 
 /**
  * Advanced entry and leave actions for entry point methods annotated with {@link CEntryPoint}.
@@ -65,8 +65,8 @@ private CEntryPointActions() {
      * @param ensureJavaThread when set to true, the method ensures that the
      *            {@link java.lang.Thread} object for the newly attached thread is created. If the
      *            parameter is set to false, a later call to one of the
-     *            {@link JavaThreads#ensurePlatformThread} methods early after the prologue must be
-     *            used to do the initialization manually.
+     *            {@link PlatformThreads#ensureCurrentAssigned} methods early after the prologue
+     *            must be used to do the initialization manually.
      * @return 0 on success, otherwise non-zero.
      */
     public static native int enterAttachThread(Isolate isolate, boolean ensureJavaThread);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java

@@ -97,7 +97,7 @@
 import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
 import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
 import com.oracle.svm.core.stack.StackOverflowCheck;
-import com.oracle.svm.core.thread.JavaThreads;
+import com.oracle.svm.core.thread.PlatformThreads;
 import com.oracle.svm.core.thread.Safepoint;
 import com.oracle.svm.core.thread.VMOperationControl;
 import com.oracle.svm.core.thread.VMThreads;
@@ -225,7 +225,7 @@ private static int createIsolate(CEntryPointCreateIsolateParameters parameters,
             return error;
         }
 
-        JavaThreads.singleton().initializeIsolate();
+        PlatformThreads.singleton().initializeIsolate();
 
         return CEntryPointErrors.NO_ERROR;
     }
@@ -407,7 +407,7 @@ private static int attachUnattachedThread(Isolate isolate, boolean inCrashHandle
 
     @SubstrateForeignCallTarget(stubCallingConvention = false)
     private static void ensureJavaThread() {
-        JavaThreads.ensurePlatformThread();
+        PlatformThreads.ensureCurrentAssigned();
     }
 
     @Snippet
@@ -445,7 +445,7 @@ public static int tearDownIsolateSnippet() {
     private static int tearDownIsolate() {
         try {
             RuntimeSupport.executeTearDownHooks();
-            if (!JavaThreads.singleton().tearDown()) {
+            if (!PlatformThreads.singleton().tearDown()) {
                 return CEntryPointErrors.UNSPECIFIED;
             }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java

@@ -48,7 +48,7 @@
 import com.oracle.svm.core.snippets.SubstrateForeignCallTarget;
 import com.oracle.svm.core.stack.JavaStackWalker;
 import com.oracle.svm.core.stack.StackFrameVisitor;
-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.VMOperation;
 import com.oracle.svm.core.thread.VMThreads.SafepointBehavior;
@@ -112,7 +112,7 @@ public static void deoptTest() {
                             ThreadingSupportImpl.isRecurringCallbackPaused() ||
                             VMOperation.isInProgress() ||
                             SafepointBehavior.ignoresSafepoints() ||
-                            !JavaThreads.currentPlatformThreadInitialized()) {
+                            !PlatformThreads.isCurrentAssigned()) {
                 return; // Thread or VM is not in a safe (or sane) state for deoptimization
             }
             Pointer startSp = KnownIntrinsics.readCallerStackPointer();