Make sure sys.dllhandle points to the right libpython-native.so in multi-context

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/objects/cext/CExtContextTest.java

@@ -81,7 +81,7 @@ public void testGetBaseName() {
 
     private static class TestCExtContext extends CExtContext {
         public TestCExtContext(PythonContext context, Object library) {
-            super(context, library);
+            super(context, library, null);
         }
 
         public static TruffleString getBN(TruffleString s) {

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

@@ -726,6 +726,10 @@ private static Object[] convertToObjectArray(TruffleString[] arr) {
     public void postInitialize(Python3Core core) {
         postInitialize0(core);
         initStd(core);
+        PythonModule sys = core.lookupBuiltinModule(T_SYS);
+        core.getContext().registerCApiHook(() -> {
+            sys.setAttribute(toTruffleStringUncached("_dllhandle_name"), toTruffleStringUncached(core.getContext().getCApiContext().getLibraryName()));
+        });
     }
 
     @TruffleBoundary

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

@@ -317,7 +317,7 @@ public static TruffleLogger getLogger(Class<?> clazz) {
     }
 
     public CApiContext(PythonContext context, Object library, NativeLibraryLocator locator) {
-        super(context, library);
+        super(context, library, locator.getCapiLibrary());
         this.nativeSymbolCache = new Object[NativeCAPISymbol.values().length];
         this.nativeLibraryLocator = locator;
 

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

@@ -79,10 +79,12 @@ public abstract class CExtContext {
 
     /** The library object representing 'libpython.*.so' or similar. */
     private final Object library;
+    private final String libraryName;
 
-    public CExtContext(PythonContext context, Object library) {
+    public CExtContext(PythonContext context, Object library, String libraryName) {
         this.context = context;
         this.library = library;
+        this.libraryName = libraryName;
     }
 
     public final PythonContext getContext() {
@@ -93,6 +95,10 @@ public final Object getLibrary() {
         return library;
     }
 
+    public final String getLibraryName() {
+        return libraryName;
+    }
+
     public static boolean isMethVarargs(int flags) {
         return (flags & CALL_CONVENTION_MASK) == METH_VARARGS;
     }

graalpython/lib-python/3/ctypes/__init__.py

@@ -465,8 +465,8 @@ def LoadLibrary(self, name):
 pydll = LibraryLoader(PyDLL)
 
 if _os.name == "nt":
-    # GraalPy change: we set the dllhandle here
-    _sys.dllhandle = _dlopen("python-native.dll", 0)
+    # GraalPy change: we set the dllhandle here, it may be different per context
+    _sys.dllhandle = _dlopen(_sys._dllhandle_name, 0)
     # End GraalPy change
     pythonapi = PyDLL("python dll", None, _sys.dllhandle)
 elif _sys.platform == "cygwin":