Skip to content

Commit 8aabab7

Browse files
cosminbascacosminbasca
committed
add new CreateThreadNode which initializes the PThread runnable for the callable object
1 parent 7d7a361 commit 8aabab7

File tree

2 files changed

+87
-22
lines changed

2 files changed

+87
-22
lines changed

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

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,14 @@
4646
import com.oracle.graal.python.builtins.CoreFunctions;
4747
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
4848
import com.oracle.graal.python.builtins.PythonBuiltins;
49-
import com.oracle.graal.python.builtins.objects.dict.PDict;
50-
import com.oracle.graal.python.builtins.objects.function.PFunction;
51-
import com.oracle.graal.python.builtins.objects.function.PKeyword;
5249
import com.oracle.graal.python.builtins.objects.thread.PLock;
5350
import com.oracle.graal.python.builtins.objects.thread.PThread;
54-
import com.oracle.graal.python.builtins.objects.tuple.PTuple;
5551
import com.oracle.graal.python.builtins.objects.type.PythonClass;
56-
import com.oracle.graal.python.nodes.argument.keywords.ExecuteKeywordStarargsNode;
57-
import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
58-
import com.oracle.graal.python.nodes.call.CallNode;
5952
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
6053
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
6154
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
62-
import com.oracle.graal.python.runtime.PythonContext;
55+
import com.oracle.graal.python.nodes.thread.CreateThreadNode;
6356
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
64-
import com.oracle.truffle.api.TruffleContext;
6557
import com.oracle.truffle.api.dsl.Cached;
6658
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
6759
import com.oracle.truffle.api.dsl.NodeFactory;
@@ -98,19 +90,9 @@ long getId() {
9890
@GenerateNodeFactory
9991
abstract static class StartNewThreadNode extends PythonBuiltinNode {
10092
@Specialization
101-
long start(VirtualFrame frame, PythonClass cls, PFunction function, PTuple args, PDict kwargs,
102-
@Cached("create()") CallNode callNode,
103-
@Cached("create()") ExecutePositionalStarargsNode getArgsNode,
104-
@Cached("create()") ExecuteKeywordStarargsNode getKwArgsNode) {
105-
PythonContext context = getContext();
106-
PThread thread = factory().createThread(cls, () -> {
107-
TruffleContext truffleContext = context.getEnv().getContext();
108-
Object prev = truffleContext.enter();
109-
Object[] arguments = getArgsNode.executeWith(args);
110-
PKeyword[] keywords = getKwArgsNode.executeWith(kwargs);
111-
callNode.execute(frame, function, arguments, keywords);
112-
truffleContext.leave(prev);
113-
});
93+
long start(VirtualFrame frame, PythonClass cls, Object callable, Object args, Object kwargs,
94+
@Cached("create()") CreateThreadNode createThreadNode) {
95+
PThread thread = createThreadNode.execute(frame, cls, callable, args, kwargs);
11496
thread.start();
11597
return thread.getId();
11698
}

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
/*
2+
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python.nodes.thread;
42+
43+
import com.oracle.graal.python.builtins.objects.function.PKeyword;
44+
import com.oracle.graal.python.builtins.objects.thread.PThread;
45+
import com.oracle.graal.python.builtins.objects.type.PythonClass;
46+
import com.oracle.graal.python.nodes.PGuards;
47+
import com.oracle.graal.python.nodes.PNodeWithContext;
48+
import com.oracle.graal.python.nodes.SpecialMethodNames;
49+
import com.oracle.graal.python.nodes.argument.keywords.ExecuteKeywordStarargsNode;
50+
import com.oracle.graal.python.nodes.argument.positional.ExecutePositionalStarargsNode;
51+
import com.oracle.graal.python.nodes.call.CallNode;
52+
import com.oracle.graal.python.nodes.truffle.PythonTypes;
53+
import com.oracle.truffle.api.TruffleContext;
54+
import com.oracle.truffle.api.dsl.ImportStatic;
55+
import com.oracle.truffle.api.dsl.TypeSystemReference;
56+
import com.oracle.truffle.api.frame.VirtualFrame;
57+
58+
@TypeSystemReference(PythonTypes.class)
59+
@ImportStatic({PGuards.class, SpecialMethodNames.class})
60+
public class CreateThreadNode extends PNodeWithContext {
61+
@Child private CallNode callNode = CallNode.create();
62+
@Child private ExecutePositionalStarargsNode getArgsNode = ExecutePositionalStarargsNode.create();
63+
@Child private ExecuteKeywordStarargsNode getKwArgsNode = ExecuteKeywordStarargsNode.create();
64+
65+
private TruffleContext getTruffleContext() {
66+
return getContext().getEnv().getContext();
67+
}
68+
69+
public PThread execute(VirtualFrame frame, PythonClass cls, Object callable, Object args, Object kwargs) {
70+
TruffleContext truffleContext = getTruffleContext();
71+
return factory().createThread(cls, () -> {
72+
Object previous = truffleContext.enter();
73+
Object[] arguments = getArgsNode.executeWith(args);
74+
PKeyword[] keywords = getKwArgsNode.executeWith(kwargs);
75+
callNode.execute(frame, callable, arguments, keywords);
76+
truffleContext.leave(previous);
77+
});
78+
}
79+
80+
public static CreateThreadNode create() {
81+
return new CreateThreadNode();
82+
}
83+
}

0 commit comments

Comments
 (0)