[GR-38880] Refactor contextvars to be closer to cpython and faster

PullRequest: graalpython/2276

Author: timfel

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

@@ -50,12 +50,9 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.contextvars.PContextVar;
-import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
-import com.oracle.graal.python.nodes.statement.ImportNode;
-import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -88,12 +85,7 @@ protected Object construct(VirtualFrame frame, Object cls, String name, PNone de
 
         @Specialization(guards = "!isPNone(def)")
         protected Object constructDef(VirtualFrame frame, Object cls, String name, Object def) {
-            Object local = factory().createThreadLocal(PythonBuiltinClassType.PThreadLocal, PythonUtils.EMPTY_OBJECT_ARRAY, PKeyword.EMPTY_KEYWORDS);
-            return factory().createContextVar(name, def, local);
-        }
-
-        protected ImportNode.ImportExpression createImportThreading() {
-            return ImportNode.createAsExpression("threading");
+            return factory().createContextVar(name, def);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/ContextVarBuiltins.java

@@ -49,11 +49,8 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.lib.PyObjectLookupAttr;
-import com.oracle.graal.python.lib.PyObjectSetAttr;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
-import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -71,16 +68,14 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     @GenerateNodeFactory
     public abstract static class GetNode extends PythonBinaryBuiltinNode {
         @Specialization
-        Object get(VirtualFrame frame, PContextVar self, PNone def,
-                        @Cached PyObjectLookupAttr lookupAtrrNode) {
-            return get(frame, self, PContextVar.NO_DEFAULT, lookupAtrrNode);
+        Object get(VirtualFrame frame, PContextVar self, PNone def) {
+            return get(frame, self, PContextVar.NO_DEFAULT);
         }
 
         @Specialization(guards = "!isPNone(def)")
-        Object get(VirtualFrame frame, PContextVar self, Object def,
-                        @Cached PyObjectLookupAttr lookupAtrrNode) {
-            Object value = lookupAtrrNode.execute(frame, self.getLocal(), "value");
-            if (value != PNone.NO_VALUE) {
+        Object get(VirtualFrame frame, PContextVar self, Object def) {
+            Object value = self.getValue();
+            if (value != null) {
                 return value;
             }
             if (def != PContextVar.NO_DEFAULT) {
@@ -97,9 +92,8 @@ Object get(VirtualFrame frame, PContextVar self, Object def,
     @GenerateNodeFactory
     public abstract static class SetNode extends PythonBinaryBuiltinNode {
         @Specialization
-        static Object get(VirtualFrame frame, PContextVar self, Object value,
-                        @Cached PyObjectSetAttr setAtrrNode) {
-            setAtrrNode.execute(frame, self.getLocal(), "value", value);
+        static Object get(VirtualFrame frame, PContextVar self, Object value) {
+            self.setValue(value);
             return PNone.NONE;
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/contextvars/PContextVar.java

@@ -41,20 +41,21 @@
 package com.oracle.graal.python.builtins.objects.contextvars;
 
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.object.Shape;
 
 public final class PContextVar extends PythonBuiltinObject {
     private final String name;
     private final Object def;
-    private final Object local;
+    private final ThreadLocal<Object> value;
 
     public static final Object NO_DEFAULT = new Object();
 
-    public PContextVar(Object cls, Shape instanceShape, String name, Object def, Object local) {
+    public PContextVar(Object cls, Shape instanceShape, String name, Object def) {
         super(cls, instanceShape);
         this.name = name;
         this.def = def;
-        this.local = local;
+        this.value = new ThreadLocal<>();
     }
 
     public String getName() {
@@ -65,8 +66,13 @@ public Object getDefault() {
         return def;
     }
 
-    public Object getLocal() {
-        return local;
+    @TruffleBoundary
+    public Object getValue() {
+        return value.get();
     }
 
+    @TruffleBoundary
+    public void setValue(Object value) {
+        this.value.set(value);
+    }
 }

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

@@ -1435,7 +1435,7 @@ public final PDebugHandle createDebugHandle(GraalHPyHandle handle) {
         return trace(new PDebugHandle(PythonBuiltinClassType.DebugHandle, getShape(PythonBuiltinClassType.DebugHandle), handle));
     }
 
-    public final PContextVar createContextVar(String name, Object def, Object local) {
-        return trace(new PContextVar(PythonBuiltinClassType.ContextVar, getShape(PythonBuiltinClassType.ContextVar), name, def, local));
+    public final PContextVar createContextVar(String name, Object def) {
+        return trace(new PContextVar(PythonBuiltinClassType.ContextVar, getShape(PythonBuiltinClassType.ContextVar), name, def));
     }
 }