python threads: switch to using the Truffle createThread API

Author: cosminbasca

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

@@ -128,14 +128,24 @@ long getStackSize(@SuppressWarnings("unused") PNone stackSize) {
             return getContext().getPythonThreadStackSize();
         }
 
-        @Specialization
-        long getStackSize(long stackSize,
-                        @Cached("createBinaryProfile()") ConditionProfile invalidSizeProfile) {
+        private long setAndGetStackSizeInternal(long stackSize, ConditionProfile invalidSizeProfile) {
             if (invalidSizeProfile.profile(stackSize < 0)) {
                 throw raise(ValueError, "size must be 0 or a positive value");
             }
             return getContext().getAndSetPythonsThreadStackSize(stackSize);
         }
+
+        @Specialization
+        long getStackSize(int stackSize,
+                        @Cached("createBinaryProfile()") ConditionProfile invalidSizeProfile) {
+            return setAndGetStackSizeInternal(stackSize, invalidSizeProfile);
+        }
+
+        @Specialization
+        long getStackSize(long stackSize,
+                        @Cached("createBinaryProfile()") ConditionProfile invalidSizeProfile) {
+            return setAndGetStackSizeInternal(stackSize, invalidSizeProfile);
+        }
     }
 
     @Builtin(name = "start_new_thread", minNumOfPositionalArgs = 3, maxNumOfPositionalArgs = 4, constructsClass = PythonBuiltinClassType.PThread)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/thread/PThread.java

@@ -48,13 +48,9 @@ public class PThread extends PythonBuiltinObject {
     public final static String GRAALPYTHON_THREADS = "GRAALPYTHON_THREADS";
     private final Thread thread;
 
-    public PThread(LazyPythonClass cls, ThreadGroup group, Runnable runnable) {
-        this(cls, group, 0, runnable);
-    }
-
-    public PThread(LazyPythonClass cls, ThreadGroup group, long stackSize, Runnable runnable) {
+    public PThread(LazyPythonClass cls, Thread thread) {
         super(cls);
-        this.thread = new Thread(group, runnable, "graalpython-thread-" + group.activeCount(), stackSize);
+        this.thread = thread;
     }
 
     @TruffleBoundary

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/thread/CreateThreadNode.java

@@ -51,7 +51,7 @@
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.truffle.api.TruffleContext;
+import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -65,17 +65,17 @@ public class CreateThreadNode extends PNodeWithContext {
 
     public PThread execute(VirtualFrame frame, PythonClass cls, Object callable, Object args, Object kwargs) {
         PythonContext context = getContext();
-        TruffleContext truffleContext = context.getEnv().getContext();
+        TruffleLanguage.Env env = context.getEnv();
 
         // TODO: python thread stack size != java thread stack size
         // ignore setting the stack size for the moment
-        return factory().createThread(cls, context.getThreadGroup(), 0, () -> {
-            Object previous = truffleContext.enter();
+        Thread thread = env.createThread(() -> {
             Object[] arguments = getArgsNode.executeWith(args);
             PKeyword[] keywords = getKwArgsNode.executeWith(kwargs);
             callNode.execute(frame, callable, arguments, keywords);
-            truffleContext.leave(previous);
-        });
+        }, env.getContext(), context.getThreadGroup());
+
+        return factory().createPythonThread(cls, thread);
     }
 
     public static CreateThreadNode create() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -768,11 +768,11 @@ public PRLock createRLock(PythonClass cls) {
         return trace(new PRLock(cls));
     }
 
-    public PThread createThread(ThreadGroup group, long stackSize, Runnable runnable) {
-        return trace(new PThread(PythonBuiltinClassType.PThread, group, stackSize, runnable));
+    public PThread createPythonThread(Thread thread) {
+        return trace(new PThread(PythonBuiltinClassType.PThread, thread));
     }
 
-    public PThread createThread(PythonClass cls, ThreadGroup group, long stackSize, Runnable runnable) {
-        return trace(new PThread(cls, group, stackSize, runnable));
+    public PThread createPythonThread(PythonClass cls, Thread thread) {
+        return trace(new PThread(cls, thread));
     }
 }