Use TruffleThreadBuilder instead of deprecated createThread API

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ThreadModuleBuiltins.java

@@ -85,6 +85,7 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.TruffleThreadBuilder;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -228,15 +229,15 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
 
             // TODO: python thread stack size != java thread stack size
             // ignore setting the stack size for the moment
-            Thread thread = env.createThread(() -> {
+            TruffleThreadBuilder threadBuilder = env.newTruffleThreadBuilder(() -> {
                 try (GilNode.UncachedAcquire gil = GilNode.uncachedAcquire()) {
 
                     // the increment is protected by the gil
                     int curCount = (int) HiddenAttr.ReadNode.executeUncached(threadModule, THREAD_COUNT, 0);
                     HiddenAttr.WriteNode.executeUncached(threadModule, THREAD_COUNT, curCount + 1);
                     try {
                         // n.b.: It is important to pass 'null' frame here because each thread has
-                        // it's own stack and if we would pass the current frame, this would be
+                        // its own stack and if we would pass the current frame, this would be
                         // connected as a caller which is incorrect. However, the thread-local
                         // 'topframeref' is initialized with EMPTY which will be picked up.
                         callNode.execute(null, callable, arguments, keywords);
@@ -251,9 +252,9 @@ long start(VirtualFrame frame, Object cls, Object callable, Object args, Object
                         HiddenAttr.WriteNode.executeUncached(threadModule, THREAD_COUNT, curCount - 1);
                     }
                 }
-            }, env.getContext(), context.getThreadGroup());
+            }).context(env.getContext()).threadGroup(context.getThreadGroup());
 
-            PThread pThread = factory.createPythonThread(cls, thread);
+            PThread pThread = factory.createPythonThread(cls, threadBuilder.build());
             pThread.start();
             return pThread.getId();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -105,6 +105,7 @@
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
+import com.oracle.truffle.api.TruffleThreadBuilder;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -1153,7 +1154,8 @@ private ReferenceQueue<Object> createReferenceQueue() {
         // lazily register the runnable that concurrently collects the queued references
         Env env = getContext().getEnv();
         if (env.isCreateThreadAllowed()) {
-            Thread thread = env.createThread(new GraalHPyReferenceCleanerRunnable(referenceQueue), null, getContext().getThreadGroup());
+            TruffleThreadBuilder truffleThreadBuilder = env.newTruffleThreadBuilder(new GraalHPyReferenceCleanerRunnable(referenceQueue)).threadGroup(getContext().getThreadGroup());
+            Thread thread = truffleThreadBuilder.build();
             // Make the cleaner thread a daemon; it should not prevent JVM shutdown.
             thread.setDaemon(true);
             thread.start();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -188,6 +188,7 @@
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.TruffleSafepoint;
+import com.oracle.truffle.api.TruffleThreadBuilder;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.GenerateUncached;
@@ -1236,7 +1237,7 @@ public SharedMultiprocessingData getSharedMultiprocessingData() {
 
     public long spawnTruffleContext(int fd, int sentinel, int[] fdsToKeep) {
         ChildContextData data = new ChildContextData(isChildContext() ? childContextData.parentCtx : this);
-        Builder builder = data.parentCtx.env.newInnerContextBuilder().//
+        Builder childContextBuilder = data.parentCtx.env.newInnerContextBuilder().//
                         forceSharing(getOption(PythonOptions.ForceSharingForInnerContexts)).//
                         inheritAllAccess(true).//
                         initializeCreatorContext(true).//
@@ -1245,7 +1246,12 @@ public long spawnTruffleContext(int fd, int sentinel, int[] fdsToKeep) {
                         // with that. Gives "OSError: [Errno 9] Bad file number"
                         // option("python.PosixModuleBackend", "java").//
                         config(PythonContext.CHILD_CONTEXT_DATA, data);
-        Thread thread = data.parentCtx.env.createThread(new ChildContextThread(fd, sentinel, data, builder));
+
+        TruffleContext childContext = childContextBuilder.build();
+        data.setTruffleContext(childContext);
+        ChildContextThread childContextRunnable = new ChildContextThread(fd, sentinel, data);
+        TruffleThreadBuilder threadBuilder = data.parentCtx.env.newTruffleThreadBuilder(childContextRunnable).context(childContext);
+        Thread thread = threadBuilder.build();
         long tid = PThread.getThreadId(thread);
         getSharedMultiprocessingData().putChildContextThread(tid, thread);
         getSharedMultiprocessingData().putChildContextData(tid, data);
@@ -1270,42 +1276,35 @@ public synchronized List<Integer> getChildContextFDs() {
         return childContextFDs;
     }
 
-    private static class ChildContextThread implements Runnable {
+    private static final class ChildContextThread implements Runnable {
         private static final TruffleLogger MULTIPROCESSING_LOGGER = PythonLanguage.getLogger(ChildContextThread.class);
         private static final Source MULTIPROCESSING_SOURCE = Source.newBuilder(PythonLanguage.ID,
                         "from multiprocessing.popen_truffleprocess import spawn_truffleprocess; spawn_truffleprocess(fd, sentinel)",
                         "<spawned-child-context>").internal(true).build();
 
         private final int fd;
         private final ChildContextData data;
-        private final Builder builder;
         private final int sentinel;
 
-        public ChildContextThread(int fd, int sentinel, ChildContextData data, Builder builder) {
+        public ChildContextThread(int fd, int sentinel, ChildContextData data) {
             this.fd = fd;
             this.data = data;
-            this.builder = builder;
             this.sentinel = sentinel;
         }
 
         @Override
         public void run() {
             try {
                 MULTIPROCESSING_LOGGER.fine("starting spawned child context");
-                TruffleContext ctx = builder.build();
-                data.setTruffleContext(ctx);
-                Object parent = ctx.enter(null);
                 CallTarget ct = PythonContext.get(null).getEnv().parsePublic(MULTIPROCESSING_SOURCE, "fd", "sentinel");
                 try {
                     data.running.countDown();
                     Object res = ct.call(fd, sentinel);
                     int exitCode = CastToJavaIntLossyNode.executeUncached(res);
                     data.setExitCode(exitCode);
                 } finally {
-                    ctx.leave(null, parent);
                     if (data.compareAndSetExiting(false, true)) {
                         try {
-                            ctx.close();
                             MULTIPROCESSING_LOGGER.log(Level.FINE, "closed spawned child context");
                         } catch (Throwable t) {
                             MULTIPROCESSING_LOGGER.log(Level.FINE, "exception while closing spawned child context", t);