Introduce class CApiContext.

Author: fangerer

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

@@ -257,7 +257,7 @@ private Object loadDynamicModuleWithSpec(String name, String path, InteropLibrar
         @TruffleBoundary
         private void ensureCapiWasLoaded() {
             PythonContext context = getContext();
-            if (!context.capiWasLoaded()) {
+            if (!context.hasCApiContext()) {
                 Env env = context.getEnv();
                 CompilerDirectives.transferToInterpreterAndInvalidate();
 

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

@@ -197,13 +197,12 @@ Object doGeneric(String name,
                         @CachedLibrary(limit = "1") @SuppressWarnings("unused") InteropLibrary interopLib,
                         @Shared("context") @CachedContext(PythonLanguage.class) @SuppressWarnings("unused") PythonContext context,
                         @Cached PRaiseNode raiseNode) {
-            return importCAPISymbol(raiseNode, interopLib, context.getCapiLibrary(), name);
+            return importCAPISymbol(raiseNode, interopLib, context.getCApiContext(), name);
         }
 
         protected static Object importCAPISymbolUncached(PythonContext context, String name) {
-            Object capiLibrary = context.getCapiLibrary();
-            InteropLibrary uncached = InteropLibrary.getFactory().getUncached(capiLibrary);
-            return importCAPISymbol(PRaiseNode.getUncached(), uncached, capiLibrary, name);
+            Object capiLibrary = context.getCApiContext().getLLVMLibrary();
+            return importCAPISymbol(PRaiseNode.getUncached(), InteropLibrary.getFactory().getUncached(capiLibrary), capiLibrary, name);
         }
 
         private static Object importCAPISymbol(PRaiseNode raiseNode, InteropLibrary library, Object capiLibrary, String name) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.objects.cext.capi;
+
+import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
+import com.oracle.graal.python.runtime.PythonContext;
+
+public final class CApiContext extends CExtContext {
+    public CApiContext(PythonContext context, Object hpyLibrary) {
+        super(context, hpyLibrary);
+    }
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -43,7 +43,25 @@
 import com.oracle.graal.python.runtime.PythonContext;
 
 public abstract class CExtContext {
-    public abstract PythonContext getContext();
 
-    public abstract Object getLLVMLibrary();
+    public static CExtContext LAZY_CONTEXT = new CExtContext(null, null) {
+    };
+
+    private final PythonContext context;
+
+    /** The LLVM bitcode library object representing 'libpython.*.so' or similar. */
+    private final Object llvmLibrary;
+
+    public CExtContext(PythonContext context, Object llvmLibrary) {
+        this.context = context;
+        this.llvmLibrary = llvmLibrary;
+    }
+
+    public final PythonContext getContext() {
+        return context;
+    }
+
+    public final Object getLLVMLibrary() {
+        return llvmLibrary;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtToNativeNode.java

@@ -41,11 +41,12 @@
 package com.oracle.graal.python.builtins.objects.cext.common;
 
 import com.oracle.graal.python.nodes.PNodeWithContext;
+import com.oracle.graal.python.runtime.PythonContext;
 
 public abstract class CExtToNativeNode extends PNodeWithContext {
 
     public final Object execute(Object object) {
-        return execute(null, object);
+        return execute(CExtContext.LAZY_CONTEXT, object);
     }
 
     public abstract Object execute(CExtContext nativeContext, Object object);

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

@@ -51,6 +51,7 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.options.OptionValues;
 
@@ -198,7 +199,7 @@ List<WeakReference<Thread>> getOwners() {
     private OutputStream out;
     private OutputStream err;
     private InputStream in;
-    @CompilationFinal private Object capiLibrary = null;
+    @CompilationFinal private CApiContext cApiContext;
     private final Assumption singleThreaded = Truffle.getRuntime().createAssumption("single Threaded");
 
     private static final Assumption singleNativeContext = Truffle.getRuntime().createAssumption("single native context assumption");
@@ -598,18 +599,6 @@ private static void writeWarning(String warning) {
         PythonLanguage.getLogger().warning(warning);
     }
 
-    public boolean capiWasLoaded() {
-        return this.capiLibrary != null;
-    }
-
-    public Object getCapiLibrary() {
-        return this.capiLibrary;
-    }
-
-    public void setCapiWasLoaded(Object capiLibrary) {
-        this.capiLibrary = capiLibrary;
-    }
-
     public HashingStorage.Equivalence getSlowPathEquivalence() {
         if (slowPathEquivalence == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -962,4 +951,17 @@ private static void releaseSentinelLock(WeakReference<PLock> sentinelLockWeakref
             }
         }
     }
+
+    public boolean hasCApiContext() {
+        return cApiContext != null;
+    }
+
+    public CApiContext getCApiContext() {
+        return cApiContext;
+    }
+
+    public void setCapiWasLoaded(Object capiLibrary) {
+        assert cApiContext == null : "tried to create new C API context but it was already created";
+        cApiContext = new CApiContext(this, capiLibrary);
+    }
 }